Merge "Revert "Update Status Bar with Badged Wifi Icons."" into oc-dr1-dev am: 66b1223415
am: c88f7ced51

Change-Id: Ica1247613e8c3156da9a10770786da70913a3a03