[automerger skipped] Merge "Ensure real touch cancels injected events" into udc-dev am: 0844ed8a -s ours

am skip reason: Merged-In I9eeacd1e48cb1cd36a55acc8a129a83edd2784fc with SHA-1 d8f2f903 is already in history

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



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