Merge "Revert^4 "[avf] Adjust IRPC VTS tests to handle AVF in unsupported env"" into main am: c9655da294

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

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