Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." am: af673e9cd2  -s ours am: 35fa16bdd7  -s ours
am: 9322324635  -s ours

Change-Id: I92c758709f97a016e68b6a5e1f401f95aa5b712b