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

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



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