Merge "Fix crash when continueTransitionReady without collecting transition"...

Merge "Fix crash when continueTransitionReady without collecting transition" into tm-qpr-dev am: bd4b118a am: 5c4bf735

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



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