Merge "Add column CAN_REPORT_AS_INVALID_NUMBER to the annotated call log." am: 8f0dae47aa am: 452e71b54b
am: 2c0b0fe409

Change-Id: I08fa539c3c98e551a5dfc82025b14cd62ce00c14