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

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

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