[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to...

[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29f" into android11-tests-dev am: 48ca333c -s ours am: ca3aa04b -s ours

am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665



Change-Id: I60af1543461fa7debbcb1de4651b14ace0f10edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>