Merge "Support carrier id in SIM_APN_URI"
am: d622632bb6

Change-Id: Ib2fcab93f07d9c6d4507b59c09c347469c90e909