[automerger skipped] Merge "Support set/get carrier id from ApnSetting" am: 72973de352 am: 3b195c1ef6
am: 03d0a6a289  -s ours

Change-Id: I857442fa2aef0a6d3366dafdfdbc0f3419376982