Merge "Bluetooth: stop pairing service correctly" am: 4e32e87e57
am: b7c50119e5

Change-Id: I353995584681bd075491c09ae8db25f4223deda7