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

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



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