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

Change-Id: I3f3a710e57e48029b00c6cc2bc0bec7816586ebc