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

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

Change-Id: Ic21d2b3131ad4e5b610835de4efa29a6e5baf00b