Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev