Merge "WAVExtractor: support for 12 channel audio files" into main am: 69a4db32

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



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