Merge "Add uri field to SipManager.ListenerRelay" into gingerbread