Merge "Convert MobileRadioPowerCalculator to work with BatteryUsageStats"