Merge "Ensure real touch cancels injected events" into udc-dev am: 0844ed8a

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



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