Merge "Merge "extractors: allow OEM to control output type for WAV/FLAC" into android10-dev am: e7f94032" into android11-tests-dev am: 39f57f12

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

Change-Id: Ic3a6f77cd3ae02c2ea9008646b0ac4cf198a195b