Implement IRPC v2 behavior in v3 am: 7d26415185 am: 3479580f86

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

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