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

Change-Id: I8e24d437afd9d77b5d48f568ed5dcc7270c45415