Merge "power_supply: add BMS for a new power supply type" into msm-3.4