[automerger skipped] Merge "Fixing displaying two carriers in split shade...

[automerger skipped] Merge "Fixing displaying two carriers in split shade header" into sc-v2-dev am: b868b036 am: 1377984d -s ours

am skip reason: Merged-In Idd2819fbe3d8b2b23f89999052cb900698ac4b11 with SHA-1 bf09696f is already in history

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

Change-Id: I6f1dae68445daed5531ac8fa9fa9c8aa9fa2d5e8