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

Change-Id: Idbefe3b3cd87e4702852defa7382c30ff8f98e50