Merge "voicemail notification settings cleanup" into oc-dev
am: 970dca4f0e

Change-Id: Iddaef61788395863dd72eb608a25ee91d6744ab0