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

Merge "[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" into android12-tests-dev am: 3f04f905 -s ours am: aa6d2eac -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: If69569f83b728bb3c12a3b32867a70cf9dfba885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>