Merge "Replace use of deprecated logging functions" into main am: 40b6a8f0 am: 7f66218e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2952670



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