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

Change-Id: Ie7050210651b33e20668686ec4502461ef1b9518