tree 614eb25d55cc498742a34e2ff417913be2df3395
parent 4a5f804da0940f6105662cbdf41b6ad2700fb3de
parent 252d2ddb6eb26dc698e8db7ccebf598356bd41ba
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579912179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579912179 +0000

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

Change-Id: I413968720709b61dba62570f11785d0da1f9881d