Revert "Hack to force ConnectivityService to maintain 2 Wifi connections"

Follow up commit will replace with proper
NetworkScore mechanism.

This reverts commit 710ec0f24ce1b314651f0f29cb95ed62945bef27.

Bug: 177373513
Test: compiles
Change-Id: I014cb1750297fa0bf5d002dfb1b2732f9fd362c7
4 files changed