Merge "Convert CpuPowerCalculator from using BatterySipper to UidBatteryConsumer"