Merge "Fixing QS expanding in split shade when swipe happens on notifications"...

Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev am: f251391e am: 55f111e2

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

Change-Id: I055fbf00112986d866de55a5e04b7df4f8a5c842