Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed...
Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." am: af673e9c -s ours
am: 35fa16bd -s ours
Change-Id: I2ed6e7c1d648bdb292437852bf4485f380af2148