Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am: 8244ebfc4e
am: a02bbdb8d8

Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca