Merge "Don't play transitions if keyguard didn't register" into udc-qpr-dev am: 9627b455

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



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