[automerger skipped] Merge "Don't play transitions if keyguard didn't...

[automerger skipped] Merge "Don't play transitions if keyguard didn't register" into udc-qpr-dev am: 9627b455 am: 2ad69dd3 -s ours

am skip reason: Merged-In Iff0f1c4af9e1da96b7bbd04bd45da9f5330fd9b1 with SHA-1 8a20c08f is already in history

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



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