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

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



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