Merge "Merge "Hide the alternate bouncer on device unlocked" into tm-qpr-dev...

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

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



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