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

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

Change-Id: I5321787c9614c02024d1ec9c2ac9c7f06dc830c3