Merge "Ensure correct audio mode is used for conferences." into tm-dev am:...

Merge "Ensure correct audio mode is used for conferences." into tm-dev am: 7d932a43 am: 1e28063f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/18328962



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