Merge "Fix NPE when run the splitscreen test" into tm-qpr-dev am: c6e40030

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



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