Merge "Add a carrier attribute (iccid prefix) for carrier id proto"