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

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

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