Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a537

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



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