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

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

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