Merge "Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to US" into main am: 84c6d5e8c6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3039132

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