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

Change-Id: I9060c668742be6698674b85e92f7bb6b8450dfbf