[automerger skipped] Update VTS SupplicantStaIfaceAidlTest#SetCountryCode to US am: 59aeb3182b am: 9ec690f303 am: 3ebf4e3c6e -s ours

am skip reason: Merged-In Idad4127ce26188145c7b07d60d5e6ce40a80aa5b with SHA-1 59aeb3182b is already in history

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

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