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

Change-Id: I7815a1d2d67b972f8357985f1172f90e0ab7d6cf