Merge "wifi: Fix for returning wrong radio combinations matrix" into tm-dev