Merge "Add process state to BatteryUsageStats atoms"