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

[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: 2160024d -s ours am: fa1bc4a7 -s ours

am skip reason: skipped by user beverlyt

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



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