am d42acbd4: am acdd1496: Merge "Fix order of voicemail ringtone initialization." into lmp-mr1-dev

* commit 'd42acbd48177d203bf66d0df26a55ab5206a5fc7':
  Fix order of voicemail ringtone initialization.