Merge "Wifi: Fix VTS tests broken due to uprev to Vendor HAL 1.6" into tm-dev