Merge "MAP: Handle concurrent MNS SDP Response and MAS Disconnection" am: 2062ba3102 am: 90dc93b8d5
am: 4f366301e1

Change-Id: I51bfb18ac846273ab8c8c8e65b5b24ddf9ee9adb