Merge changes from topic "am-fd1a3f615f394aaf91615efaed5222ab" into android11-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE TouchTest: ensure scroll amount is larger than touch slop" into android10-tests-dev am: 775444e -s ours
  [automerger skipped] DO NOT MERGE am: a36a45c -s ours

Author: android-build-merge-worker-robot