[automerger skipped] Merge "Dispatch cancel event to the correct target...

[automerger skipped] Merge "Dispatch cancel event to the correct target display" into udc-qpr-dev-plus-aosp am: 8b8fe6a0 -s ours

am skip reason: Merged-In Icf1301e5174ac61eeedda326545f2b68ef7b8af0 with SHA-1 771a769d is already in history

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



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