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

Merge "[automerger skipped] Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a537 am: efb376fe am: d0888dab am: 23532ed5 -s ours am: 9c98f29a -s ours am: 0674452b -s ours am: 3f9b491d -s ours am: 191919c4 -s ours am: 218abb01 -s ours" into udc-d1-dev-plus-aosp am: 7cbf06a3 -s ours am: 41e03bd7 -s ours

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

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



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