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

Change-Id: Ia9eb1c6b0302a4d2d3575b10cd190d84333061b2