[automerger skipped] Merge "Merge "On device lockdown, always show the...

[automerger skipped] Merge "Merge "On device lockdown, always show the keyguard" into udc-dev am: 5349dd72 am: 3482914f" into udc-d1-dev-plus-aosp am: 52c66498 am: f519dcde -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 6962dbcd is already in history

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



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