[automerger skipped] Merge "Merge "AudioDeviceVolumeManager and VolumeInfo API...

[automerger skipped] Merge "Merge "AudioDeviceVolumeManager and VolumeInfo API changes" into tm-qpr-dev am: dcb27105" into tm-qpr-dev-plus-aosp am: 6948da5e -s ours

am skip reason: Merged-In Id718fbd7e0d5795ac480d9188faad4a70fba9808 with SHA-1 7ec3e248 is already in history

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



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