Merge "Enforce AnnotatedCallLog column constraints in its content provider." am: a5322c070c am: f32e94f65b
am: 077ee6f3f0

Change-Id: Ic6c5c707b6fe2513e8cf64e0c7df4e8605064876