[automerger skipped] Merge "In repeat callers, record tel: URIs separately...

[automerger skipped] Merge "In repeat callers, record tel: URIs separately from other people strings." into sc-v2-dev am: 12a16ba0 -s ours am: 465686fd -s ours

am skip reason: Merged-In I84870436d5d8c6f24a57d4e54b848730a4c03778 with SHA-1 36062332 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16827719

Change-Id: I59d62e22c54df25357faee82dd20304b32c4b81e