Merge changes from topic "country_listener_api" into sc-dev

* changes:
  wifi: Rename country change API
  wifi: Fix wifi S module in R