Merge "usb: otg: Add support for power supply API for USB charging" into msm-3.0