[automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 am: 8df35b81ca -s ours

am skip reason: Change-Id I203b37d8e643c59d69aa26097d223fc4b3f8e332 with SHA-1 d3a397fe80 is in history

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

Change-Id: I624b886002238d1a19264867c9673f1c0759e079