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

Change-Id: I8fccd30bdd0de00a4477ea26d558ecdc437d2cea