Fix IRPCv3 pure software implementation am: e5fb905431 am: c641370370

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2481375

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