[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 skip reason: skipped by user beverlyt

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



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