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

Change-Id: I79f80162a27ef55522acb0ef74751c43fa98bfa8