Merge "Handle RTSP make port error case" am: 731c31ec84 am: f1a97ba973 am: 687dd7e1e6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I927ec2cb00bfc905aec8160296d875cdf4adf259