Merge "AVRCP: Keep the device in the map on disconnect"

bool ConnectionHandler::DisconnectDevice(const RawAddress& bdaddr) {

  for (auto it = device_map_.begin(); it != device_map_.end(); it++) {

    if (bdaddr == it->second->GetAddress()) {

      it->second->DeviceDisconnected();

      uint8_t handle = it->first;

      device_map_.erase(handle);

      return avrc_->Close(handle) == AVRC_SUCCESS;

    }

  }