Merge "Ensuring QS can't collapse (hide) in split shade" into tm-qpr-dev am:...

Merge "Ensuring QS can't collapse (hide) in split shade" into tm-qpr-dev am: 898d6d91 am: 2850dd6b

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



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