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

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

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



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