[automerger skipped] Merge "Ensure channel receives a consistent touch stream"...

[automerger skipped] Merge "Ensure channel receives a consistent touch stream" into udc-dev am: f40c23e9 am: 6ddc9f05 -s ours

am skip reason: Merged-In Ibb8ab70b0019789c1a17dae0077be6b23d3d9139 with SHA-1 92c8fd5a is already in history

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



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