Display W+ icon following carrier config Bug: 197012079 Test: manual;unit tests Change-Id: Ic3e279e08d6d311381547f675a0fdab8a9f4ff29