Merge "[DO NOT MERGE] Unify QS Headers in a ConstraintLayout" into sc-v2-dev am: 0100abaf9b

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

Change-Id: I8d76460549a056b27b8ab00d1cfeb4807ec6ed20