Merge changes from topic "am-c7317350726e4f8792fc9044da867af2" into android12L-tests-dev

* changes:
  Merge changes from topic "am-2a37c9ff7bed4801bfe9876744f6978d" into android12-tests-dev am: 4241b32
  [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

Author: android-build-merge-worker-robot