Merge "[AE Flicker Test] From a split A|B, let B start C and cover B, ending...

Merge "[AE Flicker Test] From a split A|B, let B start C and cover B, ending in a split A|C." into udc-qpr-dev am: f88118f9

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



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