Merge "Convert SensorPowerCalculator to work with BatteryUsageStats"