Merge "Fix null surface crash when switch split" into tm-qpr-dev am: a6fa69cb am: 1cb00496

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



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