Merge change 22130 into eclair

* changes:
  Call the correct function for canceling a pairing request.