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

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



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