Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled."

diff --cc src/com/android/settings/development/SelectUsbConfigPreferenceController.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
index ffb5ceb,9a08a51..5a82ca0
--- 1/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
--- 2/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SelectUsbConfigPreferenceControllerTest.java
@@@ -18,8 -18,10 +18,11 @@@ package com.android.settings.developmen
  
  import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE;
  import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY;
 +import static com.google.common.truth.Truth.assertThat;
  
+ import static junit.framework.Assert.assertFalse;
+ import static junit.framework.Assert.assertTrue;
+ 
  import static org.mockito.ArgumentMatchers.any;
  import static org.mockito.ArgumentMatchers.anyBoolean;
  import static org.mockito.ArgumentMatchers.anyString;