Merge "Do not cleanup offload related flag in bta_av_conn_cback" into sc-v2-dev

diff --cc bta/av/bta_av_aact.cc
index e6f28a3,0a0f6b5..33298d6
--- 1/bta/av/bta_av_aact.cc
--- 2/bta/av/bta_av_aact.cc
+++ b/bta/av/bta_av_aact.cc
@@@ -1885,18 -1883,17 +1885,16 @@@ void bta_av_str_stopped(tBTA_AV_SCB* p_
        bta_av_cb.audio_open_cnt, p_data, start);
  
    bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress());
 -  BTM_unblock_role_switch_for(p_scb->PeerAddress());
 -  BTM_unblock_sniff_mode_for(p_scb->PeerAddress());
 +  BTM_unblock_role_switch_and_sniff_mode_for(p_scb->PeerAddress());
  
    if (p_scb->co_started) {
-     uint16_t handle = get_btm_client_interface().lifecycle.BTM_GetHCIConnHandle(
-         p_scb->PeerAddress(), BT_TRANSPORT_BR_EDR);
-     if (bta_av_cb.offload_started_acl_hdl == handle) {
+     if (bta_av_cb.offload_started_hndl == p_scb->hndl) {
        bta_av_vendor_offload_stop();
-       bta_av_cb.offload_started_acl_hdl = HCI_INVALID_HANDLE;
-     } else if (bta_av_cb.offload_start_pending_acl_hdl == handle) {
+       bta_av_cb.offload_started_hndl = 0;
+     } else if (bta_av_cb.offload_start_pending_hndl == p_scb->hndl) {
        APPL_TRACE_WARNING("%s: Stop pending offload start command", __func__);
        bta_av_vendor_offload_stop();
-       bta_av_cb.offload_start_pending_acl_hdl = HCI_INVALID_HANDLE;
+       bta_av_cb.offload_start_pending_hndl = 0;
      }
  
      bta_av_stream_chg(p_scb, false);