Merge "power: power_supply_core: add power_supply_set_supply_type API" into msm-3.4