Merge "Merge "Revert "Improve CallsLogManager logging code."" into udc-d1-dev am: c33b98fd81 am: 287caa985b" into udc-qpr-dev-plus-aosp am: 7183382735

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/24284307

Change-Id: I2111ba7d101cab83ee348ac3cd6ab6d415ea80f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>