Merge "WifiManager#getCountryCode: clarify doc on return format" into rvc-dev