Merge "Fix where post-disconnect CEP causes single party call mode to exit." into qt-dev
am: a24f942ec0

Change-Id: I93580d3a11e031e5d07c575d9026f8f4d4695bc2