Merge "Copy custom measured power to BatteryUsageStats" into sc-dev