fix: Conflict incoming changes from 15-dev

systemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

@@ -203,6 +203,12 @@ public interface QS extends FragmentBase {
      */
     void setIsNotificationPanelFullWidth(boolean isFullWidth);
 
+    default void setPanelExpanded(boolean panelExpanded) {}
+
+    default void setQqsHeightListener(QqsHeightListener listener) {}
+
+    default void setQSContentPaddingBottom(int padding) {}
+
     /**
      * Callback for when QSPanel container is scrolled
      */
@@ -218,4 +224,10 @@ public interface QS extends FragmentBase {
         void onQsHeightChanged();
     }
 
+    @ProvidesInterface(version = HeightListener.VERSION)
+    interface QqsHeightListener {
+        int VERSION = 1;
+        void onQqsHeightChanged();
+    }
+
 }