Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev