Merge changes from topic "e-ac3-joc remote submix take2" into main am: 251789f3 am: 14d37708

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



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