Merge "Don't garbage collect voicemails in AnnotatedCallLog." am: af52cd8e29
am: df415e40ad

Change-Id: I5d6c1c97001f04e558b99dca3a23e11ab2758e29