Merge "Misc logging changes"

diff --cc src/com/android/settings/search/SearchFragment.java
index 00eb591,ee97334..1271900
--- 1/src/com/android/settings/search/SearchFragment.java
--- 2/src/com/android/settings/search/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@@ -43,8 -44,9 +44,10 @@@ import com.android.settings.core.Instru
  import com.android.settings.core.instrumentation.MetricsFeatureProvider;
  import com.android.settings.overlay.FeatureFactory;
  
+ import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.List;
 +import java.util.Set;
  import java.util.concurrent.atomic.AtomicInteger;
  
  /**

diff --cc tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index b7154ce,07b007c..44851b1
--- 1/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
--- 2/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@@ -41,11 -45,13 +45,13 @@@ import org.robolectric.annotation.Confi
  import org.robolectric.util.ActivityController;
  import org.robolectric.util.ReflectionHelpers;
  
 -import java.util.List;
 +import java.util.Set;
  
  import static com.google.common.truth.Truth.assertThat;
+ import static org.mockito.ArgumentMatchers.nullable;
  import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.anyString;
+ import static org.mockito.Matchers.argThat;
  import static org.mockito.Matchers.eq;
  import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.never;