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

Change-Id: I8f5c7bfd0cae955e6fd29de6c418e27018d47939