Merge "Display W+ icon following carrier config" into sc-qpr1-dev am:...

Merge "Display W+ icon following carrier config" into sc-qpr1-dev am: 98de9300 am: 688cc24c am: 0b9f154f

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

Change-Id: Icf5e03594370fc5194a13b875afe1ac2fd61bbcb