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

Change-Id: Iea0e2a7a335867c08c5197a478fd2a3bb1fc3cfe