Merge changes I1bada812,Ia50e462d

* changes:
  Automatically run LocaleManager CTS cases for relevant changes.
  Automatically run LocaleManager CTS cases for relevant changes.

core/java/android/app/TEST_MAPPING

@@ -146,6 +146,15 @@
                 }
             ],
             "file_patterns": ["(/|^)ContextImpl.java"]
+        },
+        {
+            "file_patterns": ["(/|^)LocaleManager.java"],
+            "name": "CtsLocaleManagerTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
         }
     ],
     "presubmit-large": [

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

@@ -7,6 +7,9 @@
           "include-filter": "com.android.server.locales."
         }
       ]
+    },
+    {
+      "name": "CtsLocaleManagerTestCases"
     }
   ]
 }