Merge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12 am: 500bfa9d4a am: edbb8c3ba4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1554975

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bd81b674299441369f4e4f0698cf6e528a2c7c0
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4f62642..49b2d60 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,9 +1,15 @@
 {
   "presubmit": [
     {
+      "name": "CtsScopedStorageCoreHostTest"
+    },
+    {
       "name": "CtsScopedStorageHostTest"
     },
     {
+      "name": "CtsScopedStorageDeviceOnlyTest"
+    },
+    {
       "name": "AdoptableHostTest"
     }
   ]