Merge "AudioService: Fix cross deadlock with AudioDeviceBroker" into rvc-dev am: 22a4895be3 am: 65690bd9c9 am: 5d2e500764 am: 582d769e58

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

Change-Id: I217ff17ada9051a37bdc2ffde31805a0dc5ee743