[automerger skipped] Merge changes from topic "rtsp_resume" into sc-dev am:...

[automerger skipped] Merge changes from topic "rtsp_resume" into sc-dev am: b486977a am: fa136922 -s ours am: f66d50d3 -s ours

am skip reason: Merged-In Icb960c9eb8f87b71b483c27b354a028b835ff349 with SHA-1 a1c64134 is already in history

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

Change-Id: I4f8eb0ce728b5ed449e458d63de41fb94b0e3ff7