Merge "skip the country code test when the country code is not support" into main am: 749898bb1e am: 17780ae4bf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527435

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