Revert "The change on Wifi_Base and Wifi_utils is for Country code testing" This reverts commit 62843c103415980d0cf4fbca491e4ec399c43f99. Reason for revert: <need to verify on presubmit> Change-Id: Ie9e0bb570c1e3786bdd544a1e9f59ed06586bc26