[automerger skipped] [DO NOT MERGE] Unify QS Headers in a ConstraintLayout am: 94f300dfe5 am: dc15e1cbc7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied16d2f8c52d666de16af0d46f8df46f2a9c4406