Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master

core/java/android/app/TEST_MAPPING

@@ -26,6 +26,14 @@
                     "include-filter": "com.android.server.appop"
                 }
             ]
+        },
+	{
+            "name": "FrameworksCoreTests",
+            "options": [
+                {
+                    "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
+                }
+            ]
         }
     ],
     "postsubmit": [

core/java/android/provider/TEST_MAPPING

@@ -0,0 +1,12 @@
+{
+    "presubmit": [
+        {
+            "name": "CtsProviderTestCases",
+            "options": [
+                {
+                    "exclude-filter": "android.provider.cts.MediaStore_Images_ThumbnailsTest"
+                }
+            ]
+        }
+    ]
+}

core/java/android/view/accessibility/TEST_MAPPING

@@ -32,6 +32,14 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
+    },
+    {
+      "name": "FrameworksCoreTests",
+      "options": [
+        {
+          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
+        }
+      ]
     }
   ],
   "postsubmit": [

core/java/android/view/textclassifier/TEST_MAPPING

@@ -10,6 +10,14 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
+    },
+    {
+      "name": "FrameworksCoreTests",
+      "options": [
+        {
+          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
+        }
+      ]
     }
   ]
 }

services/accessibility/TEST_MAPPING

@@ -65,6 +65,14 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
+    },
+    {
+      "name": "FrameworksCoreTests",
+      "options": [
+        {
+          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
+        }
+      ]
     }
   ],
   "postsubmit": [

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

@@ -45,6 +45,17 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
+    },
+    {
+      "name": "CtsAppTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.app.cts.ServiceTest#testAppZygoteServices"
+        },
+        {
+          "exclude-filter": "android.app.cts.SystemFeaturesTest#testLocationFeatures"
+        }
+      ]
     }
   ],
   "postsubmit": [