[automerger skipped] Merge "audio:fix audio stream issue." am: e90a207d am:...

[automerger skipped] Merge "audio:fix audio stream issue." am: e90a207d am: e5a5b3f3 am: 0c3ba1a8 am: 6ad6c36a -s ours

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

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

Change-Id: Iaa7187564306fdafe489ed5a7ad32af3a56e037f