Merge "[AE Flicker Test] From a split A|B, let A launch C with...

Merge "[AE Flicker Test] From a split A|B, let A launch C with alwaysExpand=true, expect C to overlay split A|B." into udc-qpr-dev am: b117774c

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



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