Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev am: 6d4db456ea
am: 6f9e2050a9

Change-Id: I8e1ef9b3462fbc2c54d4cb9d9894106ca693500c