Merge "Fix drag and drop may stuck in multi touch am: 54745651 am:...

Merge "Fix drag and drop may stuck in multi touch am: 54745651 am: f270ca49" into tm-d1-dev-plus-aosp am: 27d2717d

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



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