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

Change-Id: I8a3ac92663f810477569dd8ec43d9b714662bd7c