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

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

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



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