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

[automerger skipped] Merge "AudioDeviceVolumeManager and VolumeInfo API changes" into tm-qpr-dev am: dcb27105 am: c218ba0d -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: I4f50da6a510081c9dc832f55a69ed7d454091201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>