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

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

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