Merge "Re-order stack startup/shutdown with btm" into tm-dev

system/btif/src/stack_manager.cc

@@ -286,10 +286,10 @@ static void event_start_up_stack(UNUSED_ATTR void* context) {
 
   LOG_INFO("%s Gd shim module enabled", __func__);
   module_shut_down(get_local_module(GD_IDLE_MODULE));
+  get_btm_client_interface().lifecycle.btm_init();
   module_start_up(get_local_module(GD_SHIM_MODULE));
   module_start_up(get_local_module(BTIF_CONFIG_MODULE));
 
-  get_btm_client_interface().lifecycle.btm_init();
   l2c_init();
   sdp_init();
   gatt_init();
@@ -381,10 +381,10 @@ static void event_shut_down_stack(UNUSED_ATTR void* context) {
   l2c_free();
   sdp_free();
   get_btm_client_interface().lifecycle.btm_ble_free();
-  get_btm_client_interface().lifecycle.btm_free();
 
   LOG_INFO("%s Gd shim module disabled", __func__);
   module_shut_down(get_local_module(GD_SHIM_MODULE));
+  get_btm_client_interface().lifecycle.btm_free();
   module_start_up(get_local_module(GD_IDLE_MODULE));
 
   hack_future = future_new();