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

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



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