Merge "wifi: Rename country change API" into sc-dev