Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9fe9eaa843 am: 48df0e42d6 am: 6738a42e35

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/1912639

Change-Id: Id5f0e8594eb0b3e500c80e08179c8c881aa12a53
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 587e8a5..c758e89 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/oid-registry"
+    }
+  ],
   "presubmit": [
     {
       "name": "libapkverify.integration_test"
@@ -9,9 +14,17 @@
     },
     {
       "name": "microdroid_manager_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 50bf622..bf78496 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,4 @@
 {
-    "device": true,
-    "run": true
-}
-
+  "device": true,
+  "run": true
+}
\ No newline at end of file