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

Change-Id: I810fef44b4d5906f9c5a04c18dda354f94c161a6