Merge "MAP: Handle concurrent MNS SDP Response and MAS Disconnection"
am: 2062ba3102

Change-Id: Ie0e8e1a304b1bff16b1a30e96874dbdcac6f74f8