Merge "[RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to postsubmit for pm changes" into tm-dev

core/java/android/content/pm/TEST_MAPPING

@@ -52,20 +52,6 @@
     }
   ],
   "presubmit-large": [
-    {
-      "name": "CtsContentTestCases",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-          "include-filter": "android.content.pm.cts"
-        }
-      ]
-    },
     {
       "name": "CtsUsesNativeLibraryTest",
       "options": [
@@ -151,6 +137,20 @@
     }
   ],
   "postsubmit": [
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.pm.cts"
+        }
+      ]
+    },
     {
       "name": "CtsAppSecurityHostTestCases",
       "options": [

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

@@ -81,7 +81,7 @@
       ]
     }
   ],
-  "presubmit-large": [
+  "postsubmit": [
     {
       "name": "CtsContentTestCases",
       "options": [
@@ -95,9 +95,7 @@
           "include-filter": "android.content.pm.cts"
         }
       ]
-    }
+    },
-  ],
-  "postsubmit": [
     {
       "name": "CtsPermissionTestCases",
       "options": [