Merge "[AE Flicker Test] From Activity A launch a trampoline Activity, expect...

Merge "[AE Flicker Test] From Activity A launch a trampoline Activity, expect to finish in a split A|B" into udc-qpr-dev am: b72062c6

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



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