Merge "integrate carrier id to carrier config" am: 1bfc791242
am: a22537b610

Change-Id: I0a7e4e0a6aaea5a14f577673a7fc4e6dedfb8347