Merge "[Fixed] The button label shows misaligned on the localized screen" into...

Merge "[Fixed] The button label shows misaligned on the localized screen" into udc-dev am: 0b0e4c17 am: 846aa15d

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



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