Merge changes from topic "am-10703a0639174d02b5c360b4008fe9ef" into android14-tests-dev

* changes:
  Merge changes from topic "am-b61b6f11b8aa4ebd80ca64508f193cea" into android13-tests-dev am: 452a396
  [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

Author: android-build-merge-worker-robot