Merge "Revert "Drop connection when atttempting to disable encryption"" into tm-qpr-dev

    return;

  }

  /* if we are trying to drop encryption on an encrypted connection, drop the

   * connection */

  if (p->is_encrypted && !encr_enable) {

    LOG(ERROR) << __func__

               << " attempting to decrypt encrypted connection, disconnecting. "

                  "handle: "

               << loghex(handle);

    acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,

                               "stack::btu::btu_hcif::read_drop_encryption "

                               "Connection Already Encrypted");

    return;

  }

  p->is_encrypted = encr_enable;

  /* Process Role Switch if active */