Merge "Fixes user switcher name and icon regressions." into tm-qpr-dev am: 4ed76021

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



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