Merge "[Locale Preference] Seperate region and numbering system." into udc-dev am: 5eff8beb am: 71cabe4a

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



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