am 268b0d85: am f5c03f52: Merge "Move Voicemail notification settings into util." into lmp-mr1-dev

* commit '268b0d85550b19684a1f4c08606dd3e5bd029c92':
  Move Voicemail notification settings into util.