Merge "Updating batterystats report version."

     * New in version 30:

     *   - Uid.PROCESS_STATE_FOREGROUND_SERVICE only tracks

     *   ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE.

     * New in version 31:

     *   - New cellular network types.

     *   - Deferred job metrics.

     */

    static final int CHECKIN_VERSION = 30;

    static final int CHECKIN_VERSION = 31;

    /**

     * Old version, we hit 9 and ran out of room, need to remove.

      LTE = 13;

      EHRPD = 14;

      HSPAP = 15;

      OTHER = 16;

      GSM = 16;

      TD_SCDMA = 17;

      IWLAN = 18;

      LTE_CA = 19;

      OTHER = 20;

    };

    optional Name name = 1;

    optional TimerProto total = 2;