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

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

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



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