[automerger skipped] Revert "On device lockdown, always show the keyguard" am:...

[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e6 -s ours am: 12913fd3 -s ours am: 3afc843a -s ours am: e7ec6b0a -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: I866265d0291fdcf11eba7f1e70d783acd9738bc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>