Sort imports

Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b

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

@@ -21,10 +21,10 @@ import android.content.DialogInterface;
 import android.content.pm.PackageInfo;
 import android.os.Bundle;
 
-import com.android.settings.R;
-
 import androidx.appcompat.app.AlertDialog;
 
+import com.android.settings.R;
+
 /**
  * UI for managing the connection controlled by an app.
  *

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

@@ -28,14 +28,14 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
 /**
  * Fragment wrapper around an {@link AppDialog}.
  */

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

@@ -35,6 +35,11 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.util.ArrayUtils;
@@ -47,11 +52,6 @@ import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.Preference;
-
 public class AppManagementFragment extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         ConfirmLockdownFragment.ConfirmLockdownListener {

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

@@ -22,11 +22,11 @@ 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/ConfigDialog.java

@@ -33,13 +33,13 @@ import android.widget.CompoundButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
 import java.net.InetAddress;
 
-import androidx.appcompat.app.AlertDialog;
-
 /**
  * Dialog showing information about a VPN configuration. The dialog
  * can be launched to either edit or prompt for credentials to connect

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

@@ -31,14 +31,14 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import androidx.appcompat.app.AlertDialog;
-
 /**
  * Fragment wrapper around a {@link ConfigDialog}.
  */

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

@@ -19,13 +19,13 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
 public class ConfirmLockdownFragment extends InstrumentedDialogFragment
         implements DialogInterface.OnClickListener {
     public interface ConfirmLockdownListener {

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

@@ -22,11 +22,11 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
 
+import androidx.preference.Preference;
+
 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/VpnSettings.java

@@ -49,6 +49,10 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.net.LegacyVpnInfo;
@@ -70,10 +74,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
 /**
  * Settings screen listing VPNs. Configured VPNs and networks managed by apps
  * are shown in the same list.