Merge "wifi: fix old vts tests on newer HAL"