[automerger skipped] Merge "Fixing constraint of statusIcons in large screen shade header" into udc-dev am: 228ddbf5bd am: 697df53344 -s ours

am skip reason: Merged-In I3781c265c7fced21fc4d9554fd4c5f3b003a7924 with SHA-1 5a5f77afb0 is already in history

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

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