Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1