Merge "power_supply: Add RESISTANCE property to power supply" into msm-4.9