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

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



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