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

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



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