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

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



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