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

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

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

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

Change-Id: I3d8c5f4eebea2808f97a3031245591fbff3f2c9c