[automerger skipped] Merge "Remove IMS call logs that may leak PII" am:...

[automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0 am: 8df35b81 -s ours am: 2e111c7e -s ours am: dbf87773 -s ours am: d1721e4d -s ours

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

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

Change-Id: If04bfa47018bb53ccdb33159d6531b0887f588c6