Merge "libaudiohal@aidl: Properly handle "legacy" r_submix case" into main am:...

Merge "libaudiohal@aidl: Properly handle "legacy" r_submix case" into main am: 636a5b50 am: 365e161d

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



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