Merge "Revert "On device lockdown, always show the keyguard"" into udc-qpr-dev...

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

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



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