Merge changes I1bada812,Ia50e462d

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

2 files changed, 12 insertions, 0 deletions

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 31c81bef7357..32207af22dc1 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/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": [
diff --git a/services/core/java/com/android/server/locales/TEST_MAPPING b/services/core/java/com/android/server/locales/TEST_MAPPING
index 72b9c484cd8b..097c2bc262e1 100644
--- a/services/core/java/com/android/server/locales/TEST_MAPPING
+++ b/services/core/java/com/android/server/locales/TEST_MAPPING
@@ -7,6 +7,9 @@
           "include-filter": "com.android.server.locales."
         }
       ]
+    },
+    {
+      "name": "CtsLocaleManagerTestCases"
     }
   ]
 }
\ No newline at end of file