[automerger skipped] Merge "integrate carrier id to carrier config" am: 1bfc791242 am: a22537b610
am: 3cb166e6e7  -s ours

Change-Id: I30155e4311ded142e14f986e258512f92120c827