Merge "Do not setForceUse when a2dp config without change" am: 8a984b9f08 am: a49ca727be

author zengjing <zengjing@xiaomi.com>

Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)

committer android-build-merger <android-build-merger@google.com>

Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)
author zengjing <zengjing@xiaomi.com>
Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)
diff --cc services/core/java/com/android/server/audio/AudioService.java
Simple merge
author	zengjing <zengjing@xiaomi.com>
	Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)