Merge "Rename SIM_APN_LIST to SIM_APN_URI"
am: d594716359

Change-Id: If8708a4d84fd8dce4c7e66507320cd35369331b2