Merge "Merge "AudioDeviceVolumeManager and VolumeInfo API changes" into tm-qpr-dev am: dcb2710560" into tm-qpr-dev-plus-aosp