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

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

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