Revert "Patch Set 2/2: Add an "Automatically Connect" option for WiFi networks"

This commit breaks 3rd party apps like Tasker.  It is being reverted until a better solution can be found.

This reverts commit 3d3d0a374d3c2194701a8be4a2d926f47576f5fa

Change-Id: I31689838ec8be4aa33036ea75794cfbb7a69d109
Merge remote branch 'cm/cm-10.1'