Merge "Fix reporting of uid state in battery stats."