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

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



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