resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e

src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java

@@ -27,6 +27,7 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
 import java.util.List;
+
 /*
  * Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic
  * AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app

src/com/android/settings/wifi/NetworkRequestDialogFragment.java

@@ -26,7 +26,6 @@ import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 import android.os.Handler;

src/com/android/settings/wifi/WifiAPITest.java

@@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Provide an interface for testing out the Wifi API
  */

src/com/android/settings/wifi/WifiConfigInfo.java

@@ -26,7 +26,6 @@ import com.android.settings.R;
 
 import java.util.List;
 
-
 /**
  * Configuration details saved by the user on the WifiSettings screen
  */

src/com/android/settings/wifi/WifiDialogActivity.java

@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;

src/com/android/settings/wifi/WifiInfo.java

@@ -22,7 +22,6 @@ import android.os.Bundle;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Wifi information menu item on the diagnostic screen
  */

src/com/android/settings/wifi/WifiStatusTest.java

@@ -45,7 +45,6 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.List;
 
-
 /**
  * Show the current status details of Wifi related fields
  */

src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java

@@ -30,7 +30,9 @@ import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.RadioButton;
 import android.widget.TextView;
+
 import androidx.appcompat.app.AlertDialog.Builder;
+
 import com.android.settings.CustomListPreference;
 import com.android.settings.R;
 

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

@@ -43,7 +43,6 @@ import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
-import com.android.ims.ImsConfig;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
@@ -57,7 +56,6 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-
 /**
  * Helper class to control slices for wifi calling settings.
  */

src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java

@@ -27,7 +27,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**

src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java

@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**

src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java

@@ -19,8 +19,6 @@ package com.android.settings.wifi.slice;
 import android.content.Context;
 import android.net.Uri;
 
-import com.android.settings.slices.SliceBackgroundWorker;
-
 /**
  * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
  */