Merge "Visual Voicemail notifications now go to MainActivity when enabled." am: ca4d8a396e
am: e1ae28b3a9

Change-Id: I305eba2ba71c7e64dc86463adfbae3e45d87d4f0