Merge "Support carrier id in SIM_APN_URI"