Implement IRPC v2 behavior in v3 am: 7d26415185

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

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