Merge "If ERI roaming is OFF and SID/NID matches, use operator name from...
Merge "If ERI roaming is OFF and SID/NID matches, use operator name from CSIM." into qt-dev am: 7b9367d2 am: 62e29974
am: 7cfabc86
Change-Id: Ic7e6c4e53b5bd8e2d3c6b4762ef04540c766fa30