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

Change-Id: I6b1882e006a7b708c5979b4970a2ddc9be35f93b