Merge "[AE Flicker Test] Enter Splitscreen with another app" into udc-qpr-dev am: 6ce38fa941 am: 0fc3d23949

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

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