Use BCP47 compliant format for locale representation

base/android/locale_utils.cc

Index: base/android/locale_utils.cc
diff --git a/base/android/locale_utils.cc b/base/android/locale_utils.cc
index 30879bbbb5727df231c86ae7b7fcee26a143694d..b3a2346366c0b66936f3927b640a2e5e8dfa3083 100644
--- a/base/android/locale_utils.cc
+++ b/base/android/locale_utils.cc
@@ -16,10 +16,10 @@ std::string GetDefaultCountryCode() {
   return ConvertJavaStringToUTF8(Java_LocaleUtils_getDefaultCountryCode(env));
 }
 
-std::string GetDefaultLocale() {
+std::string GetDefaultLocaleString() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> locale = Java_LocaleUtils_getDefaultLocale(
-      env);
+  ScopedJavaLocalRef<jstring> locale =
+      Java_LocaleUtils_getDefaultLocaleString(env);
   return ConvertJavaStringToUTF8(locale);
 }