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: 8ca1bf82

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



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