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: 1efe53e8 -s ours am: 61ecdb33 -s ours am: 75564c4c -s ours am: 433f7bb0 -s ours" into udc-qpr-dev-plus-aosp am: 669c741d -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: I50425d13faef94d803da6538d758b1debfdd8be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>