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

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

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