Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44