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

Change-Id: Ia8cd7ef85f4577aea668335396ec27533615b3d7