Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/users/AppRestrictionsFragment.java

@@ -36,14 +36,6 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceViewHolder;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -66,6 +58,15 @@ import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
 public class AppRestrictionsFragment extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener,
         AppRestrictionsHelper.OnDisableUiForPackageListener {

src/com/android/settings/users/AutoSyncDataPreferenceController.java

@@ -26,8 +26,6 @@ import android.os.Bundle;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -36,6 +34,9 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
 public class AutoSyncDataPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 

src/com/android/settings/users/EditUserPhotoController.java

@@ -38,7 +38,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.ContactsContract.DisplayPhoto;
 import android.provider.MediaStore;
-import androidx.core.content.FileProvider;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -65,6 +64,8 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.core.content.FileProvider;
+
 public class EditUserPhotoController {
     private static final String TAG = "EditUserPhotoController";
 

src/com/android/settings/users/RestrictionUtils.java

@@ -22,7 +22,6 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.Settings.Secure;
 
 import com.android.settings.R;
 

src/com/android/settings/users/UserDetailsSettings.java

@@ -23,8 +23,6 @@ import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -34,6 +32,9 @@ import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
 /**
  * Settings screen for configuring a specific user. It can contain user restrictions
  * and deletion controls. It is shown when you tap on the settings icon in the

src/com/android/settings/users/UserPreference.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -32,6 +31,8 @@ import com.android.settingslib.RestrictedPreference;
 
 import java.util.Comparator;
 
+import androidx.preference.PreferenceViewHolder;
+
 public class UserPreference extends RestrictedPreference {
     private static final int ALPHA_ENABLED = 255;
     private static final int ALPHA_DISABLED = 102;