Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
am: 8244ebfc4e

Change-Id: Iea3c38056e17abc09af7f7d933cbb9627575d8ee