Merge "Revert "Show bouncer after user switch"" into udc-dev am: a97a48b5 am: 3ec6d9f9

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



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