Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20f8a0ad33c592c799103d86f64e7755f54fa85a
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index c5ad048..13f6fe6 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -172,7 +172,6 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArraySet;
-import android.util.LocalLog;
import android.util.Log;
import android.util.Pair;
import android.util.SparseArray;
@@ -193,6 +192,7 @@
import com.android.internal.util.LocationPermissionChecker;
import com.android.internal.util.MessageUtils;
import com.android.modules.utils.BasicShellCommandHandler;
+import com.android.modules.utils.LocalLog;
import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult;
import com.android.net.module.util.LinkPropertiesUtils.CompareResult;
import com.android.server.am.BatteryStatsService;