Merge 42eac3faa3aa5abac4e1ae3f0a1aa240ce304b8d on remote branch

Change-Id: Idfc0ed16626771bab65b4734d862be3e4e1c8df4
diff --git a/TEST_MAPPING b/TEST_MAPPING
index da1479a..bec5d80 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -52,6 +52,12 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {
@@ -61,6 +67,9 @@
       "name": "legacykeystore_test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
@@ -81,6 +90,12 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {
@@ -90,6 +105,9 @@
       "name": "legacykeystore_test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {