Merge "A2dpSink sends CONNECTED instead of DISCONNECTED when connection timeout"