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

Change-Id: I9448b5f145654ca425ca25b5a9f1f934c6e36b57