Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am...

am: b8b9e69a94

Change-Id: I7827b526be72fb2678d7bb662e6c13f722a8aaa9

diff --cc src/com/android/settings/slices/SettingsSliceProvider.java
index e680176,6d6c0ec..71a3828
--- 1/src/com/android/settings/slices/SettingsSliceProvider.java
--- 2/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@@ -28,11 -28,10 +28,10 @@@ 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;
  import android.util.Pair;