Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669

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

Change-Id: I15166502ad462afd8df3b520e0c0aa33013f7d22

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);
         }