Merge "Fix UI disappear even if add locale with numbering systems" into udc-dev am: 746d12a0 am: 3d6b4d18

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



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