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

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

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