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 am: dd632341

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



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