Merge "power_supply: Add additional USB PD properties" into msm-4.8