[automerger skipped] Merge "Add carrier id information to some APN settings"...
[automerger skipped] Merge "Add carrier id information to some APN settings" am: 6354dfab am: 56d2cbdb
am: 1804b07a -s ours
am skip reason: change_id Ic18eb8204a10e2b403d56be3ec8774d9222b801d with SHA1 532cfeda is in history
Change-Id: Iccd52373b24c5c509fa6afb61254d61953dde346