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

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

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