Merge "USB: phy-msm-usb: mark floated charger as DCP type"