[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 skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history

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



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