Merge "Move connectSocket into IBluetoothSocketManager (3/3)"