Merge "Fixed swipe down while shade expanding not expanding QS" into tm-qpr-dev am: 56833a3d

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



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