Merge "MODE_SHOW_BOUNCER - Make sure bouncer shows" into tm-qpr-dev am: 280d2b87

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



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