Merge "Fix squished user switcher text view." into tm-qpr-dev am: 65ae79e7 am: fbe3c6a5

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



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