Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev am: 0b45799abc
am: 2edd5e763a

Change-Id: I2386bf91d9e805f4b12c63d7732140302236dbee