Merge "Move coalescing logic out of AnnotatedCallLogContentProvider."