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

[automerger skipped] Merge "On device lockdown, always show the keyguard" into udc-dev am: 5349dd72 am: 2ac32018 -s ours am: 89099706 -s ours

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

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



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