Merge "Making sure QS are not closed when split shade is open" into tm-qpr-dev am: 99db8bd9 am: b1a6d3e6 am: 30172b1e am: 7f1a6525

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



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