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