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

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

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



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