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

Merge "[BUG] AudioPolicy: Clients: fix dumpsys" into tm-dev am: 83302867 am: 56b8cf40 am: b197233c

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



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