Merge "Don't disable QS when in split shade" into sc-v2-dev am: 2b9624f81b am: a49f078283

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

Change-Id: Ibf5543a053880ebadd3b54148657c5a37111d544