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: 547cd1a7

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



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