Merge "Return shared Emergency Country Iso for Multi-sim country iso" am: b62d7f0d74
am: 9878636766

Change-Id: I86a9e6c2e4f55b6049bb0860cae7af9fe298de6a