Merge "Track movement of some libcore/tzdata files"

    android.hidl.manager-V1.0-java \

LOCAL_STATIC_JAVA_LIBRARIES := \

    tzdata_shared2 \

    time_zone_distro \

    tzdata_update2 \

    android.hidl.base-V1.0-java-static \

    android.hardware.tetheroffload.control-V1.0-java-static \

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.SystemService;

import com.android.timezone.distro.DistroException;

import com.android.timezone.distro.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import android.app.timezone.Callback;

import android.app.timezone.DistroFormatVersion;

import java.util.Arrays;

import java.util.concurrent.Executor;

import java.util.concurrent.atomic.AtomicBoolean;

import libcore.tzdata.shared2.DistroException;

import libcore.tzdata.shared2.DistroVersion;

import libcore.tzdata.shared2.StagedDistroOperation;

import libcore.tzdata.update2.TimeZoneDistroInstaller;

// TODO(nfuller) Add EventLog calls where useful in the system server.

package com.android.server.timezone;

import com.android.timezone.distro.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import org.junit.Before;

import org.junit.Test;

import java.io.IOException;

import java.util.concurrent.Executor;

import javax.annotation.Nullable;

import libcore.tzdata.shared2.DistroVersion;

import libcore.tzdata.shared2.StagedDistroOperation;

import libcore.tzdata.update2.TimeZoneDistroInstaller;

import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION;