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

Change-Id: If1de129151aef82a0bf53b8bfea651a3ae920d08