[automerger skipped] Merge "Remove IMS logs that may contain PII" am: 4ee1537408 am: 75bef0d2f6 -s ours am: 6f8a8a1b89 -s ours am: 6e4d3dc64d -s ours am: c968ba6069 -s ours am: 18efd9ff5f -s ours

am skip reason: Change-Id I1f547668f08b8988fdd986bd462fde28a5135908 with SHA-1 f06838ce3b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1398655

Change-Id: I4527c25b11719af98a54b4ffb4067659a700035f