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

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

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



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