Snap for 10453563 from da7b4272fd00375c2a9e1fb74ea02250a44c77be to mainline-ipsec-release

Change-Id: Ib4697a456aa3c51b2ab0eacab783bb0c0b917e22
diff --git a/Android.bp b/Android.bp
index 616fb7b..9e1ffe5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,4 +83,6 @@
         "//apex_available:platform",
         "com.android.virt",
     ],
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index a46d45f..13826ca 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,43 +1,42 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/flate2"
+    },
+    {
+      "path": "packages/modules/Virtualization/apkdmverity"
+    },
+    {
+      "path": "packages/modules/Virtualization/avmd"
+    },
+    {
+      "path": "packages/modules/Virtualization/libs/apexutil"
+    },
+    {
+      "path": "packages/modules/Virtualization/libs/apkverify"
+    },
+    {
+      "path": "packages/modules/Virtualization/microdroid_manager"
+    },
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
+    },
+    {
+      "path": "packages/modules/Virtualization/vm"
+    },
+    {
+      "path": "packages/modules/Virtualization/zipfuse"
+    }
+  ],
   "presubmit": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
       "name": "crc32fast_test_src_lib"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
       "name": "crc32fast_test_src_lib"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }