[automerger skipped] Merge "[RESTRICT AUTOMERGE] Added support for feeding audio elementary streams to Stagefright" into oc-mr1-dev am: 66f4ad1db3 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/14348444

Change-Id: Ib2e8c0557f82bcdd28487029351f9428f383d3fa