Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread