Merge "Add carrier display name related CarrierConfig"