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

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



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