Revert "The change on Wifi_Base and Wifi_utils is for Country code testing" am: 6f04e88225

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/18618767

Change-Id: I1ca1d2b6f654b72d47fed7f3a026f641ff132052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>