Merge "Merge "Properly collapse QQS header when QQS is disabled" into rvc-dev...

Merge "Merge "Properly collapse QQS header when QQS is disabled" into rvc-dev am: 7566f6d3 am: 82b42fca" into rvc-d1-dev-plus-aosp am: f2cb1d69

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

Change-Id: Ie2e0e3e99053f86735c23796fb12731fff2371f6