Merge "Migrate voicemail ringtone before initing settings dialog." into lmp-mr1-dev automerge: 343fc06
automerge: 1764ea8

* commit '1764ea8c8a301143252c70a9456b17f779d8ab90':
  Migrate voicemail ringtone before initing settings dialog.