Merge "Cancel only the gesture corresponding to the dropped event" into main am: e88ab06136

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

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