Merge "Support carrier id in SIM_APN_URI" am: d622632bb6
am: ac59de4f42

Change-Id: I32755947581448ed193724ae56677f834e4bdb5d