Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483"

* changes:
  Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev am: b4287bf117
  [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours am: afbf9f72b5 -s ours