Merge "Check the DeviceId for generating DragEvent" into main am: 1750d7f8b9

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

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