Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev
am: 1cfe6e63dc

Change-Id: I57d3beae12013cd87bafe7f2581850adf5d9bf35