Merge "Move voicemail settings to dialer UI"
am: 2835d4c4c3

Change-Id: Ie803f3d7fb39962ee49a68dea46756d9ca6aed8e