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

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



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