[automerger skipped] Merge "AudioService: Unify multiple device volume...

[automerger skipped] Merge "AudioService: Unify multiple device volume selection with APM" into tm-dev am: a52caf03 -s ours

am skip reason: Merged-In Iabdf49df08a9bb3f92f0673b59ba699818746804 with SHA-1 9dbe751e is already in history

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

Change-Id: Icae1b18e7713fdc19ad8934e69c2b745e267ffb8