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

Change-Id: I4643a320fd0a3ea85a63db6dc26f7aad762b61eb