am f66c7db5: am e595a18f: Merge "Revert "Stop using the sim mnc/mcc to set...
am f66c7db5: am e595a18f: Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev
* commit 'f66c7db5':
Revert "Stop using the sim mnc/mcc to set wifi country."