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

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



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