Merge "audioservice: fix a2dp connection race condition" into pi-dev
am: 706303541e

Change-Id: I7ce96cb90aad6c826bbeb7be0e80950f2a89b517