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

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



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