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

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

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



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