Merge "Add documentation in TelephonyManager#getNetworkCountryIso" into qt-r1-dev am: cd4208e080
am: 0ab2934344

Change-Id: Ib4ef6538545b4fafba916f1ccebea13cf1ec75f3