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 am: 775cbd02

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



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