Merge "Ensure keyguard shows, and tells WM" into udc-qpr-dev am: 56916c44d7 am: dc042fcb23

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

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