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

Change-Id: I001c3b390be7ee4e5522a5fd2599c9f34e6a7686