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

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

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