Merge "[pm] Move CtsContentTestCases to postsubmit for pm changes" into udc-dev am: bc36620989

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

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

core/java/android/content/pm/TEST_MAPPING

@@ -100,20 +100,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":[
@@ -155,6 +141,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

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