Merge "Correct issue where conference calls were triggering anomalies." into udc-dev am: c5af3ba9

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



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