am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit '9cae50b38d6a58efe0799ef3697f594cb4b100f9':
  Bound the ADB connect time with a non-blocking connect