[automerger skipped] Merge "audioservice: fix a2dp connection race condition" am: e5688052 -s ours am: 64668473 -s ours Change-Id: I583507cfc59c088fab3efa6f71998eb96169c903