Merge "Ignore continue transition if not collecting" into main am: 38738df9

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



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