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

Change-Id: I244d08d6f61f7af6aea33f17879f869eb5b3fccd