Merge "Inject a handler for Keyguard transitions" into udc-dev am: 983bf1c5 am: 05e2a77b am: a3c92ed5 am: 142c1b4b

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



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