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: a18067e7 am: 798d00a6" into rvc-qpr-dev-plus-aosp am: 126f921a

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

Change-Id: I997f27e039a7045bdfba354ebf53f6ec0f60956a