Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/core/InstrumentedPreferenceFragment.java

@@ -18,8 +18,6 @@ package com.android.settings.core;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.XmlRes;
-import androidx.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -30,6 +28,9 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
 
+import androidx.annotation.XmlRes;
+import androidx.preference.PreferenceScreen;
+
 /**
  * Instrumented fragment that logs visibility state.
  */

src/com/android/settings/core/PreferenceXmlParserUtils.java

@@ -23,8 +23,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -43,6 +41,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+
 /**
  * Utility class to parse elements of XML preferences
  */

src/com/android/settings/core/SliderPreferenceController.java

@@ -15,10 +15,11 @@
 package com.android.settings.core;
 
 import android.content.Context;
-import androidx.preference.Preference;
 
 import com.android.settings.slices.SliceData;
 
+import androidx.preference.Preference;
+
 public abstract class SliderPreferenceController extends BasePreferenceController implements
         Preference.OnPreferenceChangeListener {
 

src/com/android/settings/core/SubSettingLauncher.java

@@ -22,13 +22,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.android.settings.SettingsActivity;
 import com.android.settings.SubSettings;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
 
+import androidx.annotation.VisibleForTesting;
+
 public class SubSettingLauncher {
 
     private final Context mContext;

src/com/android/settings/core/TogglePreferenceController.java

@@ -14,12 +14,13 @@
 package com.android.settings.core;
 
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
 
 import com.android.settings.slices.SliceData;
 import com.android.settings.widget.MasterSwitchPreference;
 
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
 /**
  * Abstract class that consolidates logic for updating toggle controllers.
  * It automatically handles the getting and setting of the switch UI element.

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -17,7 +17,6 @@
 package com.android.settings.core.gateway;
 
 import com.android.settings.DateTimeSettings;
-import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.IccLockSettings;
 import com.android.settings.MasterClear;
@@ -50,6 +49,7 @@ import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.applications.managedomainurls.ManageDomainUrls;
+import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
 import com.android.settings.backup.PrivacySettings;
 import com.android.settings.backup.ToggleBackupSettingFragment;
 import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;