Merge "WifiCountryCode: Remove references to SIM country code" into sc-dev