[automerger skipped] Merge "audio:fix audio stream issue." into sc-v2-dev am:...

[automerger skipped] Merge "audio:fix audio stream issue." into sc-v2-dev am: 65837e77 -s ours am: 0fbce344 -s ours am: 1c15f179 -s ours

am skip reason: Merged-In I866fbb6ee4452372d6bedab44345de28fdadda7f with SHA-1 50d621f4 is already in history

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

Change-Id: Ie310d2aba31d0cbd88599e40fe93b22771a3326f