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

Change-Id: I41e42c383dd1746835fab4a7d1712ab4323636d2