Merge changes from topic "am-2a37c9ff7bed4801bfe9876744f6978d" into android12-tests-dev

* changes:
  Merge changes from topic "am-fd1a3f615f394aaf91615efaed5222ab" into android11-tests-dev am: 6a2dbde
  [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

Author: android-build-merge-worker-robot