Merge "On device lockdown, always show the keyguard" into udc-dev am: 5349dd72 am: 3482914f

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



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