Merge "Change the API for getting PowerProfile-only BatteryUsageStats" into sc-dev