Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 21:30:27 +0000 (21:30 +0000)]

Trivial merge