Merge "Revert "Prevent video calls that down graded to audio calls from merging to"" am: 56017030f0 am: af5a15948e

Change-Id: I93e69a08d53076b326f974536d8edd119f13ecc7