Merge "Update height of SliceView"

src/com/android/settings/slices/SlicePreference.java

@@ -44,6 +44,7 @@ public class SlicePreference extends LayoutPreference {
     private void init() {
         mSliceView = findViewById(R.id.slice_view);
         mSliceView.showTitleItems(true);
+        mSliceView.setScrollable(false);
     }
 
     public void onSliceUpdated(Slice slice) {

src/com/android/settings/slices/SlicePreferenceController.java

@@ -50,7 +50,6 @@ public class SlicePreferenceController extends BasePreferenceController implemen
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-
         mSlicePreference = screen.findPreference(getPreferenceKey());
     }