Merge "Disable single party call emulation when a connection manager is in use." into qt-dev
am: ff948f4026

Change-Id: I0d034aff22b9098cf4bba5eee5b517650c6b9129