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

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

Change-Id: Ibfe6decdeda081e93e4e92e3f8c94bf8a6418593