Fixed handling of usb state during adb changes.
am: 541295a9a5  -s ours

Change-Id: I608202f6c74d0209f5507f838f103f874ed47e3b