[automerger skipped] Merge "Enable qs open while shade expansion is still running" into sc-dev am: 4ab79fdb am: bd1641ea -s ours

am skip reason: Merged-In I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8 with SHA-1 754b4ce2 is already in history

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

Change-Id: I5c13e3cf7c86404010d3dd87b2fdb4dcf6a01c46