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

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

Change-Id: I97b2def5dda65585573effdcb34ff2895b5f284b