[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the consistency of the...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the consistency of the event stream during interrupted and continued touch exploration." into main am: 4798dfdc am: 5584f1b4 -s ours am: ee480139 -s ours am: 4eb24d85 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2684569



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