Merge "Cancel only the gesture corresponding to the dropped event" into main...

Merge "Cancel only the gesture corresponding to the dropped event" into main am: e88ab061 am: 91350575 am: d47a3d31

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



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