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

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

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



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