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 am: de159db9

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



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