Merge changes from topic "revert-2835831-e-ac3-joc remote submix-WBYRASYEGP" into main am: 5b8a7fe6e3

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

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