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

Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5 am: 581a3fe4

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



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