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

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

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