Merge "Revert "[avf] Adjust IRPC VTS tests to handle AVF in unsupported env"" into main am: 4020b2bd42 am: 1946bf76cc

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

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