Merge changes from topic "revert-2835831-e-ac3-joc remote submix-WBYRASYEGP"...

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

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



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