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

[automerger skipped] Merge "Dispatch cancel event to the correct target display" into main am: 478532c0 am: 6a101212 am: 462dc34a am: 66cb582f -s ours am: 00631ec3 -s ours

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

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



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