Merge "USB: android: Handle error conditions if usb_add_config fails"