Merge "Simplify logic for connect in A2dpSinkProfile"
am: eff45f36cf

Change-Id: I78762f35350b9d7ac567e46cd30c728de6782bf3