[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 -s ours

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

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



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