Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am:...

Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4

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



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