Merge "Fixing QS not showing up in split shade" into tm-qpr-dev am: 247c1260 am: 09577d81

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



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