[automerger skipped] Merge "[DO NOT MERGE] Unify QS Headers in a...

[automerger skipped] Merge "[DO NOT MERGE] Unify QS Headers in a ConstraintLayout" into sc-v2-dev am: 0100abaf am: b3e7570e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3238189c4e006f0cc04b8b96589c62432d71f612