Merge "On device lockdown, always show the keyguard" into sc-v2-dev am:...

Merge "On device lockdown, always show the keyguard" into sc-v2-dev am: d978682f am: 63222922 am: 88d2f6c6 am: 7c180486

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



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