Merge "Ensure video provider is set on ImsConference from host connection." am: ce83506f27

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1410389

Change-Id: I3638401839334b634b1779f02d223a61399013f4