Merge "Revert "On device lockdown, always show the keyguard"" into udc-qpr-dev am: 971b800c

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



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