Decouple btm_offload feature from MBO feature

btm_offload feature is not tied to MBO feature. So
if btm_offload feature is enabled, skip the roaming
algorithm even if there are no MBO IEs in BTM frame.

Bug: 190231636
Test: Manual - Roaming test
Change-Id: Ib6e76ca11e93f0fff74ed5bd836346b1e1446a5f
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 5901946..1693631 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -4384,8 +4384,8 @@
 	config->disassoc_imminent_rssi_threshold =
 		DEFAULT_DISASSOC_IMMINENT_RSSI_THRESHOLD;
 	config->oce = DEFAULT_OCE_SUPPORT;
-	config->btm_offload = DEFAULT_BTM_OFFLOAD;
 #endif /* CONFIG_MBO */
+	config->btm_offload = DEFAULT_BTM_OFFLOAD;
 
 	if (ctrl_interface)
 		config->ctrl_interface = os_strdup(ctrl_interface);
@@ -5188,8 +5188,8 @@
 		    MBO_CELL_CAPA_NOT_SUPPORTED), 0 },
 	{ INT_RANGE(disassoc_imminent_rssi_threshold, -120, 0), 0 },
 	{ INT_RANGE(oce, 0, 3), 0 },
-	{ INT_RANGE(btm_offload, 0, 1), CFG_CHANGED_DISABLE_BTM_NOTIFY },
 #endif /* CONFIG_MBO */
+	{ INT_RANGE(btm_offload, 0, 1), CFG_CHANGED_DISABLE_BTM_NOTIFY },
 	{ INT(gas_address3), 0 },
 	{ INT_RANGE(ftm_responder, 0, 1), 0 },
 	{ INT_RANGE(ftm_initiator, 0, 1), 0 },