Merge "Add carrier Id information to the APN setting"
am: 944e8c14bd

Change-Id: Ia1d5cd7d4f73011978ad6d6f3066b0a5275f7306