[automerger skipped] Merge "Allow new gestures to cancel current gestures"...

[automerger skipped] Merge "Allow new gestures to cancel current gestures" into udc-dev am: 520797d3 -s ours

am skip reason: Merged-In I10c7ebde7c108baecb67a865f541253fa6e5f7ef with SHA-1 837fab15 is already in history

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



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