Merge "Revert "Implement IRPC v2 behavior in v3"" am: fd71b7216f

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

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