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

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

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



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