Fix a regression after: 3fe5af48 A2DP switch device refactor Test: Manual Change-Id: Id00aa3ebeb790d66f97218c9e3b1fae99f5ef6b8