Merge change 22302 into eclair

* changes:
  Set BondState to Canceled when user cancels pairing.