[automerger skipped] Merge "[DO NOT MERGE] Transition to clear state after...

[automerger skipped] Merge "[DO NOT MERGE] Transition to clear state after gesture cancelation." into rvc-qpr-dev am: ae2d666d am: 698e72d1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c3b0211d7ffe6d9ca02f94ff6edf84866f265b9