Merge "Remove clear_hidd_interrupt_cid_on_disconnect flag" into main

        btm_dm_flush_discovery_queue_on_search_cancel,

        bta_dm_stop_discovery_on_search_cancel,

        classic_discovery_only,

        clear_hidd_interrupt_cid_on_disconnect = true,

        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

        dynamic_avrcp_version_enhancement = true,

        fn btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;

        fn bta_dm_stop_discovery_on_search_cancel_is_enabled() -> bool;

        fn classic_discovery_only_is_enabled() -> bool;

        fn clear_hidd_interrupt_cid_on_disconnect_is_enabled() -> bool;

        fn device_iot_config_logging_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn gatt_robust_caching_client_is_enabled() -> bool;

#include <cstdint>

#include "bta/include/bta_sec_api.h"

#include "common/init_flags.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"

    // now disconnect CTRL

    L2CA_DisconnectReq(p_hcon->ctrl_cid);

    if (bluetooth::common::init_flags::

            clear_hidd_interrupt_cid_on_disconnect_is_enabled()) {

    p_hcon->ctrl_cid = 0;

  }

  }

  if ((p_hcon->ctrl_cid == 0) && (p_hcon->intr_cid == 0)) {

    log::verbose("INTR and CTRL disconnected");