Merge "Add a null check in RTSPSource::stop" am: 2a692162a4 am: 40db8afe2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1456267

Change-Id: I7d82148d72726ac44e9545e84e80b021a346569b