Merge "Add carrier id information to some APN settings"
am: 6354dfab17

Change-Id: Ic8af19fb683cc12c25f14d788cc239195cc4f530