resolve merge conflicts of f4835d65e to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfc01cdf5b6c14711186b5412c996f66d9611373

diff --cc bta/dm/bta_dm_act.cc
index a758d21,f708cc6..03c4530
--- 1/bta/dm/bta_dm_act.cc
--- 2/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@@ -2588,12 -2612,14 +2588,11 @@@ static uint8_t bta_dm_authentication_co
      if (bta_dm_cb.p_sec_cback)
        bta_dm_cb.p_sec_cback(BTA_DM_AUTH_CMPL_EVT, &sec_event);
  
-     if (result != HCI_ERR_LMP_RESPONSE_TIMEOUT &&
-         result != HCI_ERR_PAGE_TIMEOUT && result != HCI_ERR_CONNECTION_TOUT &&
-         result != HCI_ERR_CONN_FAILED_ESTABLISHMENT &&
-         result != HCI_ERR_KEY_MISSING) {
+     if (result == HCI_ERR_AUTH_FAILURE || result == HCI_ERR_KEY_MISSING ||
+         result == HCI_ERR_HOST_REJECT_SECURITY ||
+         result == HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE) {
 -      bdstr_t bd_addr_str;
        APPL_TRACE_WARNING("%s deleting %s - result: 0x%02x", __func__,
 -                         bdaddr_to_string((bt_bdaddr_t*)bd_addr, bd_addr_str,
 -                                          sizeof(bd_addr_str)),
 -                         result);
 +                         bd_addr.ToString().c_str(), result);
        bta_dm_remove_sec_dev_entry(bd_addr);
      }
    }