Merge "Allow new gestures to cancel current gestures" into udc-dev am: 520797d3

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



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