[automerger skipped] Merge "Added read phone state permission for getNetworkCountryIso" am: 8409679749 am: 17fd16a84b am: 6f6509fcfe -s ours
am skip reason: Change-Id I810ff0b77b93870ae3f62769977c7094789d0a5a with SHA-1 105f65068c is in history

Change-Id: I89e717678d5591ea650fd0a7deb866ddc5a09c7a