[automerger skipped] Merge "Fixing constraint of statusIcons in large screen...

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

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

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



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