Merge "Fix SetCountryCode test when US is not supported" am: 2585f44a6e am: 931a68b2e5

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

Change-Id: I2756cc8f0ae150fc94b60cc2148164f526845a71