Merge "Fix HFP SLC failure due to devices not sending the AT+BIND command" into sc-dev

diff --cc bta/ag/bta_ag_cmd.cc
index befefca,0a99eed..a9ae838
--- 1/bta/ag/bta_ag_cmd.cc
--- 2/bta/ag/bta_ag_cmd.cc
+++ b/bta/ag/bta_ag_cmd.cc
@@@ -963,9 -979,16 +979,16 @@@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p
          ** peer features do not have HF Indicators, service level conn. now open
          */
          if (!p_scb->svc_conn &&
 -            !((p_scb->features & BTA_AG_FEAT_HF_IND) &&
 +            !((p_scb->masked_features & BTA_AG_FEAT_HF_IND) &&
                (p_scb->peer_features & BTA_AG_PEER_FEAT_HF_IND))) {
            bta_ag_svc_conn_open(p_scb, tBTA_AG_DATA::kEmpty);
+         } else {
+           if (p_scb->peer_version >= HFP_VERSION_1_7 &&
+               interop_match_addr(INTEROP_SLC_SKIP_BIND_COMMAND,
+                                  &p_scb->peer_addr)) {
+             alarm_set_on_mloop(p_scb->bind_timer, BTA_AG_BIND_TIMEOUT_MS,
+                                bta_ag_bind_timer_cback, p_scb);
+           }
          }
        } else {
          val.idx = bta_ag_parse_chld(p_scb, val.str);

diff --cc bta/ag/bta_ag_int.h
Simple merge