Merge "Updated: always show the keyguard on device lockdown" into udc-qpr-dev am: db9f9d76

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



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