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

Change-Id: I2494593b47735514df730fa6cc38bc1c9ffc22ea