Merge "Fix large screen QS header" into tm-qpr-dev am: bd24d074

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



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