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 am: 0ad62152

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



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