Merge "Rename SIM_APN_LIST to SIM_APN_URI"