Merge "UsbService:update mUsbDisableRequesters for enableUsbDataWhileDocked()" into main