Merge "Replace use of deprecated logging functions" into main am: 5b9f6b70d2

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2952890

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