Merge "Bluetooth: correcting return value from cancelDiscovery"