Merge "phy-msm-usb: Put PHY in non-driving mode during charger detection"