Merge "Transition tests - Mark flaky" into tm-qpr-dev am: 3d513594 am: cae8e356

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



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