Merge "Include per process state data in the BatteryUsageStats atom"