[automerger skipped] Merge "AudioMixer: Fix MONO_EXPAND for more than 2...

[automerger skipped] Merge "AudioMixer: Fix MONO_EXPAND for more than 2 channels" am: 23c1d678 am: c7f9c25b am: 6afee2b1 am: f403a5fa -s ours am: 2564accd -s ours

am skip reason: Change-Id I45c1d7b429f66a950885bc2913a50f223a7d0248 with SHA-1 5ed1a86d is in history

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

Change-Id: I556ad34e603f9b1cb7142e8431bbb6d33df50f1d