Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev
am: ba03779236

Change-Id: Ie9c99152af59dab4225a911285fcd6005248a1d6