Merge "Inject a handler for Keyguard transitions" into udc-dev am: 983bf1c5...

Merge "Inject a handler for Keyguard transitions" into udc-dev am: 983bf1c5 am: 834e09ea am: 598a06e3

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



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