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

Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: 9b4ab43d -s ours am: 0b5a34c2 -s ours am: 896c255a -s ours am: e80ef17e -s ours am: faa64de7 -s ours" into udc-qpr-dev-plus-aosp am: 4e8a7502 -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/+/24805807



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