Merge "Simplify logic for connect in A2dpSinkProfile"