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

Change-Id: I7b70012bc2c8eec1a6b02a1f2145ef0abffb634e