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

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



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