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: 1e89705b

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



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