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

Change-Id: I413968720709b61dba62570f11785d0da1f9881d