Merge UP1A.220610.001

Change-Id: I102e51f299451708eb225f388ca0645f71f70514

Android.bp

 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_ciborium-io_license"],
 }
@@ -32,4 +30,5 @@ rust_library {
         "alloc",
         "std",
     ],
+    vendor_available: true,
 }

TEST_MAPPING

 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "postsubmit": [
+    {
+      "name": "libcert_request_validator_tests"
+    }
+  ],
   "presubmit": [
     {
       "name": "libcert_request_validator_tests"

cargo2android.json

@@ -2,5 +2,6 @@
   "device": true,
   "features": "alloc,std,",
   "run": true,
-  "dependencies": true
+  "dependencies": true,
+  "vendor-available": true
 }