[automerger skipped] [automerged blank] audio:fix audio stream issue. 2p:...

[automerger skipped] [automerged blank] audio:fix audio stream issue. 2p: 50d621f4 am: be287fe6 -s ours am: 2ff58780 -s ours am: 20ae17e4 -s ours

am skip reason: Merged-In I866fbb6ee4452372d6bedab44345de28fdadda7f with SHA-1 667374a4 is already in history

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

Change-Id: If0eec4749e1f5baf19bd4c41ffdae1f8c9859669