Merge "power_supply: Add CHARGE_COUNTER_SHADOW property to power supply"