Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359
am: a49da46d96

Change-Id: Ifa3dd2166fadd7c4fce234adedd6db3df3fcf577