FIX WIRELESS TETHER ON S4 -- reconcile wifi hard with CM

this reverts autoconnect, and fixes a few funky things that sprung up keeping it alive.

Change-Id: I718b61dd9ebf4e3d0b3d0ddc658e25f393eac80c