[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
am: 757d9ae0 -s ours
am skip reason: change_id I0d9e92968765365410909908ffcaf6dc81161ea0 with SHA1 59ab573f is in history
Change-Id: Iceaabe565398bb5f8e417af6ee667a957f8ef8bb