Merge "Don't show alt bouncer if device is already unlocked" into tm-qpr-dev...

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

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



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