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/biometrics/BiometricEnrollBase.java

@@ -16,8 +16,6 @@
 
 package com.android.settings.biometrics;
 
-import static android.app.Activity.RESULT_FIRST_USER;
-
 import android.annotation.Nullable;
 import android.content.Intent;
 import android.content.res.Resources;

src/com/android/settings/biometrics/BiometricErrorDialog.java

@@ -25,10 +25,10 @@ import android.content.DialogInterface;
 import android.hardware.biometrics.BiometricConstants;
 import android.os.Bundle;
 
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
 import androidx.appcompat.app.AlertDialog;
 
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
 /**
  * Abstract dialog, shown when an error occurs during biometric enrollment.
  */

src/com/android/settings/biometrics/BiometricStatusPreferenceController.java

@@ -21,13 +21,13 @@ import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import androidx.preference.Preference;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 
-import androidx.preference.Preference;
-
 public abstract class BiometricStatusPreferenceController extends BasePreferenceController {
 
     protected final UserManager mUm;

src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java

@@ -19,14 +19,14 @@ package com.android.settings.biometrics.face;
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.widget.FooterPreference;
 
-import androidx.preference.Preference;
-
 /**
  * Footer for face settings showing the help text and help link.
  */

src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java

@@ -18,10 +18,10 @@ package com.android.settings.biometrics.face;
 
 import android.content.Context;
 
-import com.android.settings.core.BasePreferenceController;
-
 import androidx.preference.Preference;
 
+import com.android.settings.core.BasePreferenceController;
+
 /**
  * Preference controller which allows the user to update their enrolled face.
  */

src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java

@@ -20,12 +20,12 @@ import android.content.Context;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.BasePreferenceController;
 
-import androidx.preference.Preference;
-
 /**
  * Controller for the remove button.
  */

src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java

@@ -23,10 +23,10 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
 
-import com.android.settings.core.TogglePreferenceController;
-
 import androidx.preference.Preference;
 
+import com.android.settings.core.TogglePreferenceController;
+
 /**
  * Preference controller for Face settings page controlling the ability to unlock the phone
  * with face.

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

@@ -39,6 +39,8 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.biometrics.BiometricEnrollSidecar;
@@ -46,8 +48,6 @@ import com.android.settings.biometrics.BiometricErrorDialog;
 import com.android.settings.biometrics.BiometricsEnrollEnrolling;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import androidx.appcompat.app.AlertDialog;
-
 /**
  * Activity which handles the actual enrolling for fingerprint.
  */

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

@@ -22,6 +22,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -29,8 +31,6 @@ import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricEnrollSidecar.Listener;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import androidx.annotation.Nullable;
-
 /**
  * Activity explaining the fingerprint sensor location for fingerprint enrollment.
  */

src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java

@@ -29,10 +29,10 @@ import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
 
-import com.android.settings.R;
-
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.R;
+
 /**
  * A view containing a VideoView for showing the user how to enroll a fingerprint
  */

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

@@ -37,6 +37,14 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -56,14 +64,6 @@ import com.android.settingslib.widget.FooterPreference;
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
 /**
  * Settings screen for fingerprints
  */

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java

@@ -23,6 +23,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -30,10 +34,6 @@ import com.android.settings.SetupWizardUtils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
 
     @Override