Merge "Fix TransitionTests#testFlagFillsTask_openActivityFillingTask" into...

Merge "Fix TransitionTests#testFlagFillsTask_openActivityFillingTask" into tm-qpr-dev am: 58b37f9a

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



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