Merge "Move Voicemail notification settings into util." into lmp-mr1-dev