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

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



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