Snap for 10453563 from 13de129ed5af2d1652c6a4d3d2e7d5e37e84d394 to mainline-adservices-release

Change-Id: Ic936fef05f7ee08d5b7ef27d7ecc9cab0d1308c5

Android.bp

diff --git a/Android.bp b/Android.bp
index 63fb98c..b645598 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // 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_synstructure_license"],
 }
@@ -35,8 +33,6 @@
         "libunicode_xid",
     ],
     compile_multilib: "first",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
+    product_available: true,
+    vendor_available: true,
 }

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..5f54cfa
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "imports": [
+    {
+      "path": "external/rust/crates/zeroize"
+    },
+    {
+      "path": "external/uwb/src"
+    },
+    {
+      "path": "system/keymint/derive"
+    },
+    {
+      "path": "system/keymint/hal"
+    }
+  ]
+}