[automerger skipped] Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to...

[automerger skipped] Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to US am: 59aeb318 -s ours am: 5c934711 -s ours am: 77098341 -s ours

am skip reason: Merged-In Idad4127ce26188145c7b07d60d5e6ce40a80aa5b with SHA-1 73e55bdb is already in history

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



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