Sort imports

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

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b

tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java

@@ -23,6 +23,8 @@ import android.content.Intent;
 import android.provider.Settings;
 import android.text.format.DateFormat;
 
+import androidx.preference.SwitchPreference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -36,8 +38,6 @@ import org.robolectric.shadows.ShadowApplication;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.preference.SwitchPreference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class AutoTimeFormatPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;

tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.verify;
 import static org.robolectric.shadow.api.Shadow.extract;
 
@@ -24,6 +25,8 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 
@@ -35,8 +38,6 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
 public class AutoTimeZonePreferenceControllerTest {

tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java

@@ -17,12 +17,16 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
 
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -35,9 +39,6 @@ import org.robolectric.shadows.ShadowApplication;
 
 import java.util.List;
 
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class TimeFormatPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;

tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java

@@ -18,6 +18,8 @@ package com.android.settings.datetime.timezone;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Test;
@@ -29,8 +31,6 @@ import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class BaseTimeZoneAdapterTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java

@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.Activity;
 import android.content.Context;
 
+import androidx.preference.Preference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -28,8 +30,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class BaseTimeZonePreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java

@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.Activity;
 import android.icu.util.TimeZone;
 
+import androidx.preference.Preference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -28,8 +30,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class FixedOffsetPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java

@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.app.Activity;
 
+import androidx.preference.Preference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -27,8 +29,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class RegionPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@ import static org.mockito.Mockito.when;
 import android.widget.Filter;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
 import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
@@ -45,9 +49,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {
         RegionSearchPickerTest.ShadowBaseTimeZonePicker.class,

tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java

@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.Activity;
 import android.icu.util.TimeZone;
 
+import androidx.preference.Preference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -28,8 +30,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class RegionZonePreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java

@@ -19,6 +19,8 @@ package com.android.settings.datetime.timezone;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.spy;
 
+import androidx.preference.Preference;
+
 import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -29,8 +31,6 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.Date;
 import java.util.Locale;
 
-import androidx.preference.Preference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class TimeZoneInfoPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone.model;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;