Merge "Refactor function signature and move mock back" into main am: 1004d0c834

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

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