Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b am: 002b5a72a0 am: 09b3f4e417

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1e8075c9cf3179f049be59d2b16a83b42ebae47
This commit is contained in:
Serik Beketayev
2021-02-06 08:54:38 +00:00
committed by Automerger Merge Worker

View File

@@ -172,7 +172,6 @@ import android.security.KeyStore;
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.IndentingPrintWriter;
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;