Merge "Cancellable gesture should always have cancellation token" into udc-dev...

Merge "Cancellable gesture should always have cancellation token" into udc-dev am: 90c01a2a am: 6b9b2aab am: b02112b2

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



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