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

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

Change-Id: Ia647d7daee2766e28975b7dfe0e97ff30f414962