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

Change-Id: I6e6661646c5b9c8ac9e77bbd0b122be0993e6ea7