Merge "Ensure MERGE_COMPLETE connection event propagates for IMS conferences."...

Merge "Ensure MERGE_COMPLETE connection event propagates for IMS conferences." into udc-dev am: c3cda062 am: d65da322

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22259734



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