Merge "Write proto for process state usage time in UidBatteryConsumer" into main