[automerger skipped] Merge "Disable single party call emulation when a connection manager is in use." am: aecf341f49 -s ours am: 113f8de8dd -s ours am: 633e6c0407 -s ours
am: 8feabb0c02 -s ours
am skip reason: change_id I05caffeb44252340013478a138c4f28415f7b3fa with SHA1 a9d5c38e02 is in history

Change-Id: I1c4bade1803734c018017525385f57cf387cf0d1