Merge "Move CtsUsageStatsTestCases to "presubmit" group only" am: 78fe90eb10

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

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

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

@@ -4,6 +4,7 @@
       "name": "CtsUsageStatsTestCases",
       "options": [
         {"include-filter": "android.app.usage.cts.UsageStatsTest"},
+        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},
         {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
         {"exclude-annotation": "androidx.test.filters.FlakyTest"},
         {"exclude-annotation": "androidx.test.filters.MediumTest"},
@@ -19,18 +20,6 @@
       ]
     }
   ],
-  "presubmit-large": [
-    {
-      "name": "CtsUsageStatsTestCases",
-      "options": [
-        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},
-        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-        {"exclude-annotation": "androidx.test.filters.MediumTest"},
-        {"exclude-annotation": "androidx.test.filters.LargeTest"}
-      ]
-    }
-  ],
   "postsubmit": [
     {
       "name": "CtsUsageStatsTestCases"

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

@@ -61,9 +61,7 @@
         { "include-filter": "com.android.server.am.MeasuredEnergySnapshotTest" },
         { "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }
       ]
-    }
+    },
-  ],
-  "presubmit-large": [
     {
       "name": "CtsUsageStatsTestCases",
       "file_patterns": [

services/usage/java/com/android/server/usage/TEST_MAPPING

@@ -18,9 +18,7 @@
           "exclude-filter": "com.android.server.usage.StorageStatsServiceTest"
         }
       ]
-    }
+    },
-  ],
-  "presubmit-large": [
     {
       "name": "CtsUsageStatsTestCases",
       "options": [