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

Change-Id: I4c758b028d0b6bf83ab38b70b17372902763d972