Merge "Merge "If ERI roaming is OFF and SID/NID matches, use operator name...
Merge "Merge "If ERI roaming is OFF and SID/NID matches, use operator name from CSIM." into qt-dev am: 7b9367d2 am: 264c9323" into qt-r1-dev-plus-aosp
am: 0fc8f650
Change-Id: Iad00ad19077a3853e5c53d73928c29723a1a5f13