am 595b728a: am bfcfb7ee: Merge change 22302 into eclair

Merge commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d'

* commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d':
  Set BondState to Canceled when user cancels pairing.