[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: 3ee339a4 -s ours am: e6d97ec3 -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: I297e7830188f7d57cb78d084a8b60b6b36b5f085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>