Merge "Crash during Task switch" into main am: 441f3367

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



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