Merge "Fix bugs with QS customizer when split shade is active." into sc-v2-dev am: 1351c6f6d6 am: 8aafc9d814

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

Change-Id: I1c95ea4ef645b595f3a7da2bdd5e2291a97dbf2f