Merge "Make Settings Slider Slices one row" into pi-dev am: 4199198ec2

am: 2c7fe6f8ea

Change-Id: I0910df206d702cc348371c57da27ddf698faa6ff

diff --cc src/com/android/settings/slices/SliceBuilderUtils.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/testutils/SliceTester.java
index a451acf,d505529..e72168d
--- 1/tests/robotests/src/com/android/settings/testutils/SliceTester.java
--- 2/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@@ -43,8 -43,9 +43,9 @@@ import androidx.slice.SliceMetadata
  import androidx.slice.builders.ListBuilder;
  import androidx.slice.core.SliceAction;
  import androidx.slice.core.SliceQuery;
+ import androidx.slice.widget.EventInfo;
  
 -import android.support.v4.graphics.drawable.IconCompat;
 +import androidx.core.graphics.drawable.IconCompat;
  
  import com.android.settings.Utils;
  import com.android.settings.slices.SettingsSliceProvider;