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

[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: ce3d510a -s ours am: a6ce9a99 -s ours

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

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



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