Merge "Convert several PowerCalculators to use BatteryUsageStats"