resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus...

Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

diff --cc src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 8ae334c,c5fec42..f74dc0f
--- 1/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
--- 2/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@@ -19,9 -21,11 +21,12 @@@ import static android.net.ConnectivityM
  import android.content.Context;
  import android.hardware.usb.UsbManager;
  import android.hardware.usb.UsbPort;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v7.preference.PreferenceCategory;
 -import android.support.v7.preference.PreferenceScreen;
+ import android.net.ConnectivityManager;
+ 
++import androidx.annotation.VisibleForTesting;
 +import androidx.preference.PreferenceCategory;
 +import androidx.preference.PreferenceScreen;
 +
  import com.android.settings.R;
  import com.android.settings.Utils;
  import com.android.settings.widget.RadioButtonPreference;

diff --cc tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 989a293,2da8944..6e43d48
--- 1/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
--- 2/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@@ -26,9 -31,10 +31,10 @@@ import android.app.Activity
  import android.content.Context;
  import android.hardware.usb.UsbManager;
  import android.hardware.usb.UsbPort;
 -import android.net.ConnectivityManager;
 -import android.support.v7.preference.PreferenceCategory;
 -import android.support.v7.preference.PreferenceManager;
 -import android.support.v7.preference.PreferenceScreen;
++
 +import androidx.preference.PreferenceCategory;
 +import androidx.preference.PreferenceManager;
 +import androidx.preference.PreferenceScreen;
  
  import com.android.settings.testutils.SettingsRobolectricTestRunner;
  import com.android.settings.testutils.shadow.ShadowUtils;