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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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