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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59a -s ours am: 3815edc6 -s ours am: 3307ef05 -s ours am: 742411fe -s ours am: 627877e4 -s ours am: e00bac3a -s ours am: bb58a7ab -s ours

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

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



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