Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"

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

@@ -976,6 +976,8 @@ public class NetworkController extends BroadcastReceiver {
                 combinedActivityIconId = mMobileActivityIconId;
                 combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
                 mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+            } else {
+                mMobileActivityIconId = 0;
             }
         }