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: e954c7ea am: 7f1f5ddd am: cef9029c

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



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