[automerger skipped] Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to US am: 59aeb3182b -s ours am: 5c93471127 -s ours

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

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

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