Merge "usb: msm_otg: always register USB power_supply"