Merge "Return shared Emergency Country Iso for Multi-sim country iso" into qt-r1-dev
am: 558d822e2a

Change-Id: Ifd0eef6795fc4d73738375ff80eec5bdab87360b