Merge "adb: retry connecting disconnected emulators instead of always looping." am: 50e91fec0e am: cfb0c5cd91 am: 16dad488b3
am: a06dc0bb9e

* commit 'a06dc0bb9e8193e826302054555a418762007159':
  adb: retry connecting disconnected emulators instead of always looping.

Change-Id: Iec92bb0425877e05fe8a83ec7ad92ce5a6ade2d3