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

Change-Id: I3d23790c8c807d2f313397c7e53502511dbade3b