[automerger skipped] Merge "Updated: always show the keyguard on device...

[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5 am: 581a3fe4 -s ours am: 9e9cdd8e -s ours am: 24350601 -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: If81f03413276052a4aee6db439c227fe3b9b6eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>