Merge "Add documentation in TelephonyManager#getNetworkCountryIso" am: 753f6c3e5a
am: 06a0b6a010

Change-Id: I9268455d8074763205c4c6f3f9101ace0b6ea12a