Merge "Merge "Don't show alt bouncer if device is already unlocked" into...

Merge "Merge "Don't show alt bouncer if device is already unlocked" into tm-qpr-dev am: f8a2b24f am: c9d0660a" into udc-dev am: e3d78002

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



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