Merge "[automerger skipped] Merge "A2DP: Don't wait for role switch on a...
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 skip reason: change_id I0d9e92968765365410909908ffcaf6dc81161ea0 with SHA1 59ab573f is in history" into qt-qpr1-dev-plus-aosp