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