Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/vpn2/AppManagementFragment.java

@@ -34,7 +34,6 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -51,6 +50,8 @@ import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.List;
 
+import androidx.preference.Preference;
+
 public class AppManagementFragment extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         ConfirmLockdownFragment.ConfirmLockdownListener {

src/com/android/settings/vpn2/AppPreference.java

@@ -21,11 +21,12 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
-import androidx.preference.Preference;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 
+import androidx.preference.Preference;
+
 /**
  * {@link androidx.preference.Preference} containing information about a VPN
  * application. Tracks the package name and connection state.

src/com/android/settings/vpn2/ConfigDialogFragment.java

@@ -18,7 +18,6 @@ package com.android.settings.vpn2;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.ConnectivityManager;
@@ -35,7 +34,6 @@ import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.net.LegacyVpnInfo;
-import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

src/com/android/settings/vpn2/ConfirmLockdownFragment.java

@@ -15,10 +15,9 @@
  */
 package com.android.settings.vpn2;
 
-import android.app.Fragment;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
 

src/com/android/settings/vpn2/LegacyVpnPreference.java

@@ -19,13 +19,14 @@ package com.android.settings.vpn2;
 import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
 
 import android.content.Context;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
+import androidx.preference.Preference;
+
 /**
  * {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and
  * its connection state.

src/com/android/settings/vpn2/ManageablePreference.java

@@ -23,8 +23,8 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
-import com.android.settings.widget.GearPreference;
 import com.android.settings.R;
+import com.android.settings.widget.GearPreference;
 
 /**
  * This class sets appropriate enabled state and user admin message when userId is set

src/com/android/settings/vpn2/VpnSettings.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.vpn2;
 
+import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
+
 import android.annotation.UiThread;
 import android.annotation.WorkerThread;
 import android.app.Activity;
@@ -40,8 +42,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
@@ -71,7 +71,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
 
 /**
  * Settings screen listing VPNs. Configured VPNs and networks managed by apps