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

Change-Id: Ia208f5b9c0a8cbf0b938d8c2bf199bfdcab03f5f