[automerger skipped] Merge "AudioMixer: Enable 5.1 based for fallback downmix"...

[automerger skipped] Merge "AudioMixer: Enable 5.1 based for fallback downmix" am: 580a0d55 am: 92447b3f am: c90c2220 -s ours am: 0af2bb46 -s ours am: 0f9e829f -s ours

am skip reason: Merged-In Ie093319c5fefc459165ae3d6c57b7836e8b625e5 with SHA-1 8514b930 is already in history

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



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