Merge "Added voicemail.settings to packages.mk." am: 3066a0bfd1
am: e108f41cb6

Change-Id: I8daa55986103a32d94a9c94b7cf62e16a78e9d30