Merge "Null locale causing the VTS fail." am: 179f30a4 am: 95681916

am: e9fe9372

Change-Id: I715e3b8126e1506c9d02f0be278fb8baad396018

core/java/android/view/AccessibilityIterators.java

@@ -147,6 +147,9 @@ public final class AccessibilityIterators {
         @Override
         public void onConfigurationChanged(Configuration globalConfig) {
             final Locale locale = globalConfig.getLocales().get(0);
+            if (locale == null) {
+                return;
+            }
             if (!mLocale.equals(locale)) {
                 mLocale = locale;
                 onLocaleChanged(locale);