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

Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368