Merge "Merge "Increase the height of the bar so the text fits inside the...

Merge "Merge "Increase the height of the bar so the text fits inside the TextViews" into tm-qpr-dev am: 5480a55e am: 2553df8e" into udc-dev am: 6f0cb81a

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



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