Merge "AudioMixerOps: Support 10-channel" into main am: 13b8e00b3d am: 9811f8608d

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

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