Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev