Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev