Merge "Do not slip touch into window with same input channel" into udc-dev am: 8aedbf30

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



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