resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e

src/com/android/settings/network/AllowedNetworkTypesListener.java

@@ -17,7 +17,6 @@
 package com.android.settings.network;
 
 import android.content.Context;
-import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -26,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.util.concurrent.Executor;
 
-
 /**
  * {@link TelephonyCallback} to listen to Allowed Network Types changed
  */
@@ -49,7 +47,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
     }
 
     /**
-     * Register a PhoneStateListener for Allowed Network Types changed.
+     * Register a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */
@@ -60,7 +58,7 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
     }
 
     /**
-     * Unregister a PhoneStateListener for Allowed Network Types changed.
+     * Unregister a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */

src/com/android/settings/network/MobilePlanPreferenceController.java

@@ -47,7 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.List;
 
-
 public class MobilePlanPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
 

src/com/android/settings/network/NetworkScorerPickerPreferenceController.java

@@ -23,7 +23,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 

src/com/android/settings/network/VpnPreferenceController.java

@@ -47,7 +47,6 @@ import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 
-
 public class VpnPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 

src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS user setting for enhanced 4G LTE
  */

src/com/android/settings/network/ims/ImsQueryProvisioningStat.java

@@ -21,7 +21,6 @@ import android.telephony.ims.feature.MmTelFeature;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS provision stat
  */

src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS tty on VoLte stat
  */

src/com/android/settings/network/ims/ImsQueryVtUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS VT enabled settings from user
  */

src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java

@@ -19,7 +19,6 @@ package com.android.settings.network.ims;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS WFC enabled settings from user
  */

src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java

@@ -22,11 +22,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.telephony.ims.ImsManager;
-import android.telephony.ims.ImsRcsManager;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java

@@ -37,7 +37,6 @@ import androidx.preference.SwitchPreference;
 
 import com.android.settings.network.SubscriptionUtil;
 
-
 /**
  * Controller for the "Contact Discovery" option present in MobileNetworkSettings.
  */

src/com/android/settings/network/telephony/MobileDataDialogFragment.java

@@ -31,7 +31,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
 
-
 /**
  * Dialog Fragment to show dialog for "mobile data"
  *

src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java

@@ -28,7 +28,6 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
 
-
 /**
  * Class to show the footer that can't connect to 5G when device is in DSDS mode.
  */

src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java

@@ -20,8 +20,6 @@
  */
 package com.android.settings.network.telephony;
 
-import android.content.Context;
-
 public interface TelephonyAvailabilityHandler {
 
     /**

src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java

@@ -41,7 +41,6 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.network.telephony.NetworkSelectSettings;
 import com.android.settings.network.telephony.TelephonyBasePreferenceController;
 
-
 /**
  * Preference controller for "Open network select"
  */