I'm so glad I found this video. This is from Season 3. Andy and Sam are back in the job, both in uniforms and they are happy. I guess they are together which is really good.
Unfortunately I can't embed the video, embedding is disabled by request it says but click HERE and watch it on YouTube.