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

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



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