[automerger skipped] Merge "Added read phone state permission for getNetworkCountryIso" am: 5c58ad3e6f am: d2a68256ca am: 19e51a17fa -s ours
am skip reason: Change-Id I79f67580f34bd873c1a0deed9313b8d60050391e with SHA-1 1e81ccd240 is in history

Change-Id: I128f089e0b8870ec3cbaaa28d692aa3cde0c911e