Merge "usb: otg: use power supply framework to set supply type" into msm-3.4