Merge "Improve resilience of testSplitFromOverview()" into tm-qpr-dev am: 5c5797d9bb am: b340f1401f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21314098

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