Merge "integrate carrier id to carrier config" am: cc37384e58
am: 9a93149dab

Change-Id: If10abd107b6cf8f07819993fdcbee58328034ab3