Merge "Return display name in SipConnection.getCnapName()." into gingerbread