[automerger skipped] Added fix for Support non PCM output requests am:...

[automerger skipped] Added fix for Support non PCM output requests am: 7c325276 am: ba754150 -s ours

am skip reason: Merged-In I006be240d60648aa547b31ddc54ebf365b90d8fc with SHA-1 2a603284 is already in history

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



Change-Id: Iab7347e653efbf216003a385c252f0ded02e50b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>