Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev

* changes:
  Merge changes from topic "am-9099d682e3ba4a988431510855241774" into android12-tests-dev am: 191e93d403
  [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