Merge "[Bouncer] refine entry for bouncer user switcher." into tm-qpr-dev am: d77c16f9

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



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