[automerger skipped] Merge "On device lockdown, always show the keyguard" into...

[automerger skipped] Merge "On device lockdown, always show the keyguard" into sc-v2-dev am: d978682f am: 63222922 am: 2aaea3e4 -s ours am: a12b873b -s ours am: 7a624021 -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 c851ef6d is already in history

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



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