Merge "Merge "Inform ImsVideoCallProviderWrapper of video state changes." into...
Merge "Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev am: 11594832 am: 5ae0e757" into oc-dr1-dev-plus-aosp
am: d105cece
Change-Id: I3f8b5a543966c33dcaea00ceb1e7b28e4c752d38