Merge "Making sure collapseOrExpandedQs doesn't do anything in split shade" into tm-qpr-dev am: f7c1cc0e81

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21466104

Change-Id: I72f36a3dbab32dfcb478fa1992be7c0ca7774154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

@@ -1378,6 +1378,9 @@ public class QuickSettingsController {
     }
 
     private void collapseOrExpandQs() {
+        if (mSplitShadeEnabled) {
+            return; // QS is always expanded in split shade
+        }
         onExpansionStarted();
         if (getExpanded()) {
             flingQs(0, FLING_COLLAPSE, null, true);