[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: 88d2f6c6 am: 7c180486 -s ours am: 3238a42f -s ours

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

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



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