Merge "Fix split screen test case failure" into tm-qpr-dev am: 8af0860b

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



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