Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01
am: 2b7118fcbf

Change-Id: I4ca39a58ed1d35eae4a0b8802c027cd0c4c271ee