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

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



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