Merge "Convert WakelockPowerCalculator to work with BatteryUsageStats" into sc-dev