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

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

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