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

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



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