Merge "qcacld-3.0: Remove sir_convert_addts_req2_struct()" into wlan-cld3.driver.lnx.2.0