Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev am: 6cc66e45 am: 8960819a

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



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