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

Change-Id: I7c1471987762f39547abaa4179531f7850f5e6a8