Merge "Move calculations from BatteryStatsHelper to PowerCalculators"