Merge "Log key params wo sensitive info" into main am: b14b1bfda5

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

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