[automerger skipped] [DO NOT MERGE] Transition to clear state after gesture cancelation. am: a9027a7f9f am: fd24f5cadb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I97e2c45744852088510725a54934f6959ca86280