Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile"
am: beeb35f0de

Change-Id: Id3180db7835d637c352f795a52e4c59b3801714d