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

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



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