Merge "MAP: Add MNS SDP Search during setNotificationRegistration."