Snap for 10453563 from de810465feb79a4c0b2bb9037bcf4fe8a4efb5eb to mainline-adservices-release

Change-Id: Ia62121fe6c6462e6a4ca8d50448e82250e4ca112
diff --git a/Android.bp b/Android.bp
index 010a3be..208932d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,4 +51,6 @@
         "libquote",
     ],
     compile_multilib: "first",
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8029a19..e9aa65e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,16 +3,39 @@
   "imports": [
     {
       "path": "external/rust/crates/base64"
-    }
-  ],
-  "presubmit": [
+    },
     {
-      "name": "authfs_device_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
+      "path": "external/rust/crates/libsqlite3-sys"
+    },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/apkdmverity"
+    },
+    {
+      "path": "packages/modules/Virtualization/authfs"
+    },
+    {
+      "path": "packages/modules/Virtualization/avmd"
+    },
+    {
+      "path": "packages/modules/Virtualization/encryptedstore"
+    },
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
+    },
+    {
+      "path": "packages/modules/Virtualization/vm"
+    },
+    {
+      "path": "packages/modules/Virtualization/zipfuse"
+    },
+    {
+      "path": "system/security/diced"
+    },
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }