Merge "GattServer: Check for null for mServerMap.connIdByAddress"