Merge changes from topic "am-c198557146ab441c9702d29824bc857b"

* changes:
  Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev am: fb3c951f11 -s ours
  Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am: aa6d2eacf4 -s ours