[automerger skipped] Merge "Return shared Emergency Country Iso for Multi-sim country iso" am: b62d7f0d74 am: 9878636766
am: cd1a7457bb -s ours
am skip reason: change_id I356191fe09e8c58445260f3f45d0fac0e1eff67c with SHA1 b9d961a5e1 is in history

Change-Id: I7747d83d3c80b8b22f503a7cc0e2e48d1c59e600