Only update Carrier Merged WiFi state if it is default

Bug: 189528935
Test: Manual test
Change-Id: I93c94d1e4d5e61ef9d6bf4ad8ecffbd88cfc4c4d

packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java

@@ -86,7 +86,9 @@ public class WifiSignalController extends
     @Override
     public void notifyListeners(SignalCallback callback) {
         if (mCurrentState.isCarrierMerged) {
-            notifyListenersForCarrierWifi(callback);
+            if (mCurrentState.isDefault) {
+                notifyListenersForCarrierWifi(callback);
+            }
         } else {
             notifyListenersForNonCarrierWifi(callback);
         }