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

Change-Id: Ied35cc5e37da58f3631a733566efbfd381b495b5