Merge 70b8af1630e7d5c0e96fc98a55d14b573b5eef29 on remote branch

Change-Id: Iff6f2520b43f1046716dabf7d31afcc7d948fc44
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8e6577d..32e6a97 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,5 +11,18 @@
       // Confirm VTS test can pass
       "name": "VtsHalPowerStatsV1_0TargetTest"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "gtest_isolated_tests"
+    },
+    {
+      // Confirm GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST behavior
+      "name": "VtsHalBluetoothA2dpV1_0TargetTest"
+    },
+    {
+      // Confirm VTS test can pass
+      "name": "VtsHalPowerStatsV1_0TargetTest"
+    }
   ]
 }