[automerger skipped] Merge "Don't insert certain numbers into the call log" am: 01f0135ba4 am: e806a49791 am: a7cb9ccd59  -s ours
am: 773136a1b2  -s ours

Change-Id: Icef1ce2175825dca19cd850669c925e6897571d0