[automerger skipped] Merge "Don't insert certain numbers into the call log" am: 574f1ac391 am: 211cb64e7f
am: b65cdce5d7  -s ours

Change-Id: I53943b329a0e2d506986c2188df1255a51584926