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

Change-Id: I2ed6e7c1d648bdb292437852bf4485f380af2148