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

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

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