[automerger] Merge "audioservice: fix a2dp connection race condition" into pi-dev...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)
diff --cc services/core/java/com/android/server/audio/AudioService.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)