Merge "Support additional keyguard transitions" into udc-dev am: f0219531...

Merge "Support additional keyguard transitions" into udc-dev am: f0219531 am: e85d216c am: 28d04f81

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



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