Merge "Changed VoicemailProvider demo app to use new VoicemailContract api."