Merge "WifiManager#getCountryCode: clarify doc on return format" into rvc-dev am: 19850263 am: dc0fc712 Change-Id: I4643a320fd0a3ea85a63db6dc26f7aad762b61eb