resolved conflicts for ae0d983d to mnc-dr-dev-plus-aosp

Change-Id: Ia701519a512273989c8ab3b9224242d5b4164603

diff --cc btif/src/btif_pan.c
index 13ada4e,cbb8d97..d3fb89b
--- 1/btif/src/btif_pan.c
--- 2/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@@ -632,9 -686,10 +689,9 @@@ static void bta_pan_callback_transfer(U
              }
          case BTA_PAN_CLOSE_EVT:
              {
-                 btpan_conn_t* conn = btpan_find_conn_handle(p_data->close.handle);
- 
 +                LOG_INFO(LOG_TAG, "%s: event = BTA_PAN_CLOSE_EVT handle %d", __FUNCTION__, p_data->close.handle);
+                 btpan_conn_t* conn = btpan_find_conn_handle(p_data->close.handle);
 -
 -                LOG_INFO("%s: event = BTA_PAN_CLOSE_EVT handle %d", __FUNCTION__, p_data->close.handle);
+                 btpan_close_conn(conn);
  
                  if (conn && conn->handle >= 0)
                  {