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

Change-Id: I8caa8b5ee1fd070020551bbb7035c4904f98f284