Merge "Make ScreenPowerCalculator use measured energy with BatteryUsageStats" into sc-dev