Settings: Wi-Fi country code (1 of 2)

Change-Id: I8a078bde0ab40818784635477eb466510a1c230e
Merge "Settings: Wi-Fi country code (1 of 2)" into kk4.4