Merge "Implement a PowerCalculator to attribute system service power to apps"