[automerger skipped] Merge "Fix drag and drop access wrong pointer id" into...

[automerger skipped] Merge "Fix drag and drop access wrong pointer id" into tm-qpr-dev am: 190ac25e am: 6b5694b6 -s ours

am skip reason: Merged-In Ia5d91814a2aca56095c29b029e35e66cd669bce9 with SHA-1 b75c2aa9 is already in history

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



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