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

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

Change-Id: I1974f30bb376ba9b29eca42be8494b70881fd5bc