Merge "Revert "Revert "Revert "[avf] Adjust IRPC VTS tests to handle AV..."" into main am: 2000d6735a am: dd10e1ec2c am: cb153f6f2e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2829350

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