[conflict] Merge "AudioDeviceVolumeManager: set volume per device" into tm-qpr-dev am: 22430618

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



Change-Id: I66687232d1d42a81b75a3ecd58ed849347471524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>