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

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

Change-Id: I1f7b1c6d345e065339f1952e902ccaf92998f063