Merge "Dispatch cancel event to the correct target display" into main am: 478532c0

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



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