Merge "adb: retry connecting disconnected emulators instead of always looping."