Merge "fastboot: remove retries on invalid IO iterator in OSX" am: be65e040d4 am: 7f72b30e65 am: 679e670e5c

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

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