Merge "Ensure the keyguard is force-shown after a power off/on during unlock."...

Merge "Ensure the keyguard is force-shown after a power off/on during unlock." into udc-qpr-dev am: 690cde69

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



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