Merge "Add editable_voicemail_number key to CarrierConfig"