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

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

Change-Id: I505e3a7b3eaac055879335b4c3bfe6a5d2b8629b