Merge "Revert^2 "Show bouncer after user switch"" into udc-qpr-dev am: 200b7f04 am: 30ba5a31

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



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