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

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

Change-Id: I49e79e87f5e1116ba917bb60a477b702904e00e9
Signed-off-by: Automerger Merge Worker <[email protected]>