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

Change-Id: Ie61a067af5a96a0495bab82020e84dfa5dd621ee