Merge "[ShellTrans] Fix SystemUI crash when finish keyguard animation." into tm-qpr-dev am: b61b09ee1d am: d12c8ea67f

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

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