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

Merge "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" into udc-qpr-dev-plus-aosp am: f50555ef

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



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