Merge "Move SipService out of SystemServer to phone process." into gingerbread