Merge branch 'bugfix/fix_device_name_len_limited_mr' into 'master'

Fix the issue of device name len limited

Closes BT-2066

See merge request espressif/esp-idf!15880

components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h

@@ -162,8 +162,6 @@
 #define UC_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE  FALSE
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32
-
 //Device Nane Maximum Length
 #ifdef CONFIG_BT_MAX_DEVICE_NAME_LEN
 #define UC_MAX_LOC_BD_NAME_LEN  CONFIG_BT_MAX_DEVICE_NAME_LEN
@@ -171,6 +169,8 @@
 #define UC_MAX_LOC_BD_NAME_LEN 64
 #endif
 
+#if CONFIG_IDF_TARGET_ESP32
+
 //BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #ifdef CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
 #define UC_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP  CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP