Merge "audio:should stop btsco when client died" am: 5a76779d3a am: aa7c44e7bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781189

Change-Id: I05674bf6169903c36ef6e7b9397d0288de348c6a