Merge "Merge "Merge "Merge "Merge "extractors: allow OEM to control output...

Merge "Merge "Merge "Merge "Merge "extractors: allow OEM to control output type for WAV/FLAC" into android10-dev am: e7f94032" into android11-tests-dev am: 39f57f12" into android12-tests-dev am: 1c3a679f" into android12L-tests-dev am: 1df88fb3" am: 9e256869 am: e22d9d39 am: c6576525 am: e790adc5 am: 07c93ab9

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



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