Merge "Fixing trimmed button text issue Screenshots at...

Merge "Fixing trimmed button text issue Screenshots at http://shortn/_CDfDuV4thn" into udc-qpr-dev am: 4b3c214f am: 1b0ffdcd

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



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