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

Change-Id: Ifc28e91a2e8b93ac3c80359322c65c87f7d21254