Merge "CallLogListItemViewHolder distinguishes block/spam numbers" into nyc-dev