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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f3 -s ours am: 4e40bd70 -s ours am: 78006c6e -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change.

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



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