Merge "[DO NOT MERGE] Transition to clear state after gesture cancelation." into rvc-qpr-dev am: ae2d666dc7

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

Change-Id: Ic7ef4953fc42aa4e61cbc355cacc95d00d269479