Revert "revamp wifi services"

This reverts commit 46900b75318932f3d968a304362e1c0687cbc19f.
changes for bluetooth

Change-Id: I6e7d24835f483beef2792a470b2e87ab13fe9fb0
Revert "Revert "revamp wifi services"" *FIXME*

This reverts commit e3547888c93d2bbb811f17dc4a013c346f084702.