am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"

* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
  Bluetooth: correcting return value from cancelDiscovery