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

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

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