[automerger skipped] Merge "integrate carrier id to carrier config" am: cc37384e58 am: 9a93149dab
am: f54b45c68b  -s ours

Change-Id: I4ea12702bd8da6eb74394c2bda0ae7316bbae7ed