[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5 am: f5f42938 -s ours

am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 5fba6ecb is already in history

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



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