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