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