[automerger skipped] Merge "A2DP: Don't wait for role switch on a blacklisted...
[automerger skipped] Merge "A2DP: Don't wait for role switch on a blacklisted device" into qt-r1-dev
am: af28427f -s ours
am skip reason: change_id I0d9e92968765365410909908ffcaf6dc81161ea0 with SHA1 59ab573f is in history
Change-Id: I3022c9ec0608ba9384d5cf25363005691dbb09d7