Merge "Fix text on tab was not located in the middle" into udc-dev am: 210ec85e am: bad7ea5f

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



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