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

Change-Id: Ibfca1684e353e05c96147ced12ae1d3ef20fac4a