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

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

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