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: Iff361413a46599d2e9b64636954e20ee259f1a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>