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

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

Change-Id: Id8a668ae61976bb6d66b4c25240cf27fc8754c23