Commit 209dfb2f authored Mar 03, 2021 by Paul Hu Committed by Automerger Merge Worker Mar 03, 2021

Merge "resolve merge conflicts of a8ebd89c to...

Merge "resolve merge conflicts of a8ebd89c to sc-dev" into sc-dev am: cf280d0e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63176699b094a6f509a37d9a86dc428ee54eaabf

packages/SettingsLib/src/com/android/settingslib/Utils.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.location.LocationManager;
		import android.media.AudioManager;
		import android.net.ConnectivityManager;
		import android.net.NetworkCapabilities;
		import android.net.TetheringManager;
		import android.net.vcn.VcnTransportInfo;
		import android.net.wifi.WifiInfo;
		import android.os.BatteryManager;