Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497

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



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