Merge branch 'bugfix/resolve_redefinition_in_spp_and_hid' into 'master'

resolve redefinition in btc_spp.h and btc_hd.h/btc_hh.h

Closes IDFGH-7647

See merge request espressif/esp-idf!18617

components/bt/host/bluedroid/btc/profile/std/include/btc_spp.h

@@ -50,14 +50,14 @@ typedef union {
         tSDP_UUID *p_uuid_list;
     } start_discovery;
     //BTC_SPP_ACT_CONNECT
-    struct connect_arg {
+    struct conn_arg {
         esp_spp_sec_t sec_mask;
         esp_spp_role_t role;
         UINT8 remote_scn;
         esp_bd_addr_t peer_bd_addr;
     } connect;
     //BTC_SPP_ACT_DISCONNECT
-    struct disconnect_arg {
+    struct disconn_arg {
         UINT32 handle;
     } disconnect;
     //BTC_SPP_ACT_START_SRV