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

Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b