Merge "fix QS header for new ConstraintLayout version" into tm-qpr-dev am: e291396eca

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

Change-Id: I35a1869bf9a405dac33db770772069f47ae8ab9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>