Merge "Mark voicemail populated by simualtor as VVM3." am: da53f1b3c4
am: 261c66209e

Change-Id: I08c9f8474c72c4ff5ae0312056f7ae91cbc9abbc