Merge "Revert "Improve CallsLogManager logging code."" into udc-qpr-dev am: 6960b67ef8 am: 6b9a9a4c2b

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

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