[automerger skipped] Merge "Enable qs open while shade expansion is still...

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

am skip reason: Merged-In I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8 with SHA-1 685a868e is already in history

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

Change-Id: I914e2f5a4519cbff99fed234a9cf49298653a2c5