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

Change-Id: Id4bbff8834f97f60c211dd3c45ce59af95fbb810