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

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



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