Merge "Remove unnecessary usage of deprecated Time class"

import static android.telephony.CarrierConfigManager.KEY_MONTHLY_DATA_CYCLE_DAY_INT;

import static android.telephony.SubscriptionPlan.BYTES_UNLIMITED;

import static android.telephony.SubscriptionPlan.LIMIT_BEHAVIOR_DISABLED;

import static android.text.format.Time.TIMEZONE_UTC;

import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_JOBS;

import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_MULTIPATH;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.MediumTest;

import android.text.TextUtils;

import android.text.format.Time;

import android.util.DataUnit;

import android.util.Log;

import android.util.Pair;

import java.util.Iterator;

import java.util.LinkedHashSet;

import java.util.List;

import java.util.TimeZone;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.Future;

     * Path on assets where files used by {@link NetPolicyXml} are located.

     */

    private static final String NETPOLICY_DIR = "NetworkPolicyManagerServiceTest/netpolicy";

    private static final String TIMEZONE_UTC = "UTC";

    private BroadcastInterceptingContext mServiceContext;

    private File mPolicyDir;

    private static NetworkPolicy buildFakeMobilePolicy(int cycleDay, long warningBytes,

            long limitBytes, boolean inferred){

        final NetworkTemplate template = buildTemplateMobileAll(FAKE_SUBSCRIBER_ID);

        return new NetworkPolicy(template, cycleDay, new Time().timezone, warningBytes,

        return new NetworkPolicy(template, cycleDay, TimeZone.getDefault().getID(), warningBytes,

                limitBytes, SNOOZE_NEVER, SNOOZE_NEVER, true, inferred);

    }