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

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



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