Don't show wifi in status bar in QS DO NOT MERGE

This is a partial revert of the revert of
d1ba5fbb54a02fad0c68f71183078527bfa9bd49

Test: manual
Change-Id: If5675620026c9e90855525a20a8fd92987acbf80
Fixes: 16544554
2 files changed