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

Change-Id: Iabd888a924226e0a333fe0600daf4bec154eb832