Merge "Fix null dereference in WMShell transition" into main am: 91dcf18eb0 am: 5f675beb2b

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

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