Merge "Add tracking of uid process states in battery stats."