Fix drag and drop may stuck in multi touch am: 54745651cc am: f270ca49ab

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

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