Merge "Hide the alternate bouncer on device unlocked" into tm-qpr-dev am: 8eb543ff am: 18e88890

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



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