[automerger skipped] Merge "Ignore continue transition if not collecting" into...

[automerger skipped] Merge "Ignore continue transition if not collecting" into main am: 38738df9 am: dd8293ec -s ours

am skip reason: Merged-In Ie81fafbb368357121bf0c2d7d40ac556ac7a9c6e with SHA-1 05487a29 is already in history

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



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