Merge "Making sure collapseOrExpandedQs doesn't do anything in split shade"...

Merge "Making sure collapseOrExpandedQs doesn't do anything in split shade" into tm-qpr-dev am: f7c1cc0e am: d8a601b6 am: 9fd962fc am: 522e22e6

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



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