[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: bcaa806d am: 69d393bd -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: Id8170108ac5dfb1bdcc5c80301e0ab970a247efe