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

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



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