Merge "Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to US" into main