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

Change-Id: Iab75056a4abb1578e9f07b5adbdea74e07c7ae22