Merge "Ensure video provider is set on ImsConference from host connection." into rvc-qpr-dev am: 1118ffe0c7 am: f02902a566

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

Change-Id: I746420400dfc80c93945b38fe8459b9a4b19c91d