Merge "USB: gadget: android: Do not enable USB if usb_add_config fails" into msm-3.0