Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25 am: 6c65be4d3e  -s ours
am: 9e3b41ddef  -s ours

Change-Id: Id809127620df186cdc05eaa408427e21a8b45a90