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 am: 9a5fd7eb

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



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