Merge "Fixed broken VoicemailContentProviderTest."