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

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



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