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

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

Change-Id: I70a2c76471e62b5b0a012e5385568dafc43c6e62