Revert "Fix AdvancedWifiSettings"

This reverts commit 259570d93455aac5c083a15ee2e3d578b952118f.
Revert "Settings: Wi-Fi country code"

This reverts commit 5b830ca8ed4d73cedffda0b488729aed948e9d3b.

Conflicts:

	res/values/revolt_strings.xml