Merge "incidentd: Updating BatteryStats process states."