tree 48aaf6bf7fe459f6fcced4f73c30f682fcca83db
parent adea73c9759a18bcacd7eda9717afa36651dc103
parent 950e8b2273b2ce25e38110f5a0d8a252f8d6a6e8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579824376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579824376 +0000

Merge "Prevent video calls that down graded to audio calls from merging to conference call." am: ffcc97937d am: 950e8b2273

Change-Id: Ic2ea5a1302127daea929a6cf341c2f073126e02e