Merge "Move CtsScopedStorage* tests to "presubmit" groups" am: 55bf3a37 am:...

Merge "Move CtsScopedStorage* tests to "presubmit" groups" am: 55bf3a37 am: 1620d1c8 am: a3ecef64 am: eb87f429

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2461002



Change-Id: I111235ad82c8c66160e3f66bdd2af030aadf56b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/TEST_MAPPING

@@ -22,6 +22,18 @@
             ],
             "file_patterns": ["NotificationManagerService\\.java"]
         },
+        {
+            "name": "CtsScopedStorageCoreHostTest",
+            "file_patterns": ["StorageManagerService\\.java"]
+        },
+        {
+            "name": "CtsScopedStorageHostTest",
+            "file_patterns": ["StorageManagerService\\.java"]
+        },
+        {
+            "name": "CtsScopedStorageDeviceOnlyTest",
+            "file_patterns": ["StorageManagerService\\.java"]
+        },
         {
             "name": "FrameworksMockingServicesTests",
             "options": [
@@ -62,18 +74,6 @@
         }
     ],
     "presubmit-large": [
-        {
-            "name": "CtsScopedStorageCoreHostTest",
-            "file_patterns": ["StorageManagerService\\.java"]
-        },
-        {
-            "name": "CtsScopedStorageHostTest",
-            "file_patterns": ["StorageManagerService\\.java"]
-        },
-        {
-            "name": "CtsScopedStorageDeviceOnlyTest",
-            "file_patterns": ["StorageManagerService\\.java"]
-        },
         {
             "name": "CtsContentTestCases",
             "options": [