Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893

am: 2332aad2a6

Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3

diff --cc AndroidManifest.xml
Simple merge

diff --cc src/com/android/settings/network/AirplaneModePreferenceController.java
Simple merge

diff --cc src/com/android/settings/search/DatabaseIndexingManager.java
Simple merge

diff --cc src/com/android/settings/slices/SettingsSliceProvider.java
index 8aac2e3,b33308c..340a996
--- 1/src/com/android/settings/slices/SettingsSliceProvider.java
--- 2/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@@ -24,10 -24,11 +24,11 @@@ import android.content.Intent
  import android.graphics.drawable.Icon;
  import android.net.Uri;
  import android.net.wifi.WifiManager;
+ import android.os.StrictMode;
  import android.provider.Settings;
 +import androidx.annotation.VisibleForTesting;
  import android.provider.SettingsSlicesContract;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v4.graphics.drawable.IconCompat;
 +import androidx.core.graphics.drawable.IconCompat;
  import android.text.TextUtils;
  import android.util.ArrayMap;
  import android.util.Log;