Merge "Move LocaleManagerTests to presubmit suite." into tm-dev am: 722c06c14d

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

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

core/java/android/app/TEST_MAPPING

@@ -159,6 +159,15 @@
                 }
             ],
             "file_patterns": ["(/|^)ContextImpl.java"]
+        },
+        {
+            "file_patterns": ["(/|^)LocaleManager.java"],
+            "name": "CtsLocaleManagerTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
         }
     ],
     "presubmit-large": [
@@ -186,16 +195,6 @@
         {
             "file_patterns": ["(/|^)ActivityThreadTest.java"],
             "name": "FrameworksCoreTests"
-        },
-        // TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
-        {
-            "file_patterns": ["(/|^)LocaleManager.java"],
-            "name": "CtsLocaleManagerTestCases",
-            "options": [
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
-                }
-            ]
         }
     ]
 }

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

@@ -10,10 +10,7 @@
     },
     {
       "name": "CtsLocaleManagerHostTestCases"
-    }
-  ],
-  "postsubmit": [
-    // TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
+    },
     {
       "name": "CtsLocaleManagerTestCases"
     }