Fix IRPCv3 pure software implementation am: e5fb905431 am: c641370370 am: 8915aa4580

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

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