Merge "Bluetooth: stop pairing service correctly"