Merge "adb: don't reset usb when connecting it."
am: 4b8087aeb2

Change-Id: Idbd9241dec2cf35568fd110dc1fa6a56615de941