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

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



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