resolve merge conflicts of 071352de to master.

import android.content.res.Resources;

import android.net.NetworkPolicy;

import android.net.NetworkStatsHistory;

import android.net.TrafficStats;

import android.os.Handler;

import android.os.Message;

import android.text.Spannable;

import android.text.format.Formatter.BytesResult;

import android.text.format.Time;

import android.util.AttributeSet;

import android.util.MathUtils;

import android.view.MotionEvent;

import android.view.View;

        @Override

        public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {

            value = MathUtils.constrain(value, 0, TrafficStats.TB_IN_BYTES);

            final BytesResult result = Formatter.formatBytes(res, value,

                    Formatter.FLAG_SHORTER | Formatter.FLAG_CALCULATE_ROUNDED);

            setText(builder, sSpanSize, result.value, "^1");