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

Merge "Merge "[Fixed] The button label shows misaligned on the localized screen" into udc-dev am: 0b0e4c17" into udc-dev-plus-aosp am: 64b5b586 am: 72b9e690

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



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