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

* commit '6f6209fbfeab2ca24c0ceef69aeb008955116faf':
  Migrate voicemail ringtone before initing settings dialog.