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