Merge "Add usage time for process state for UidBatteryConsumer atom proto" into main

    message UidBatteryConsumer {

        optional int32 uid = 1;

        optional BatteryConsumerData battery_consumer_data = 2;

        optional int64 time_in_foreground_millis = 3;

        optional int64 time_in_background_millis = 4;

        // DEPRECATED Use time_in_state instead.

        optional int64 time_in_foreground_millis = 3 [deprecated = true];

        // DEPRECATED Use time_in_state instead.

        optional int64 time_in_background_millis = 4 [deprecated = true];

        message TimeInState {

            enum ProcessState {

                UNSPECIFIED = 0;

                FOREGROUND = 1;

                BACKGROUND = 2;

                FOREGROUND_SERVICE = 3;

            }

            optional ProcessState process_state = 1;

            optional int64 time_in_state_millis = 2;

        }

        repeated TimeInState time_in_state = 5;

    }

    repeated UidBatteryConsumer uid_battery_consumers = 5;