[automerger skipped] Merge "DO NOT MERGE TouchTest: ensure scroll amount is larger than touch slop" into android10-tests-dev am: 775444e -s ours am: af3a4f3 -s ours am: ea30fe9 -s ours am: 7bce85c -s ours am: 8a6634c -s ours am: fa27b64 -s ours am: 70445f1 -s ours am: 0a98ae4 -s ours am: fb72931 -s ours am: c9e8b01 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2748053

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

Author: Treehugger Robot