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

Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 8ca3fb34 -s ours am: d4527635 -s ours" into udc-qpr-dev-plus-aosp am: 201e35fd -s ours

am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 35a6e2f2 is already in history

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



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