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

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

Change-Id: I81e13d4fe646e112955c527b23d6314c886eb482