Merge changes from topic "presubmit-am-34a614a547fa4fdcae3fee7586500690"
* changes:
[automerge] Wifi: Fix VTS tests broken due to uprev to Vendor HAL 1.6 2p: 7f40eee6 2p: cfff46ef
[automerge] Wifi: Fix VTS tests broken due to uprev to Vendor HAL 1.6 2p: 7f40eee6