Snap for 10453563 from a7b0c2a34645253966c39c9d031d8d4e50d92cdc to mainline-mediaprovider-release

Change-Id: I28f72c26490b9099d4e63bd685bf1b5436d096f8

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index a952140..76a1dc0 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,13 +1,15 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
   "presubmit": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
       "name": "libsqlite3-sys_test_src_lib"
     },
     {
@@ -16,12 +18,6 @@
   ],
   "presubmit-rust": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
       "name": "libsqlite3-sys_test_src_lib"
     },
     {