[automerger skipped] Merge "audioservice: fix a2dp connection race condition" am: e568805209  -s ours am: 6466847321  -s ours
am: d32dca9663  -s ours

Change-Id: I257b73130b71e0223a1c81d217c758a2a7bc1c96