Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711
am: 63668e4396

Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f