Merge "Fix flaky legacy split screen flicker tests" into sc-dev am: a3e28dec

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

Change-Id: I930dfc0f4ef24390d60f92481a8a83ef04971079