Merge changes from topic "e-ac3-joc remote submix" into main am: 39e35398 am: 9c07a03e

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



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