Merge "Merge "[BUG] AudioPolicy: Clients: fix dumpsys" into tm-dev am:...

Merge "Merge "[BUG] AudioPolicy: Clients: fix dumpsys" into tm-dev am: 83302867 am: 56b8cf40" into tm-d1-dev-plus-aosp am: 578f8552

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



Change-Id: I3e1971adb9dfbf4d9a9ac862762ab59b8794e373
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>