Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev am: ac7f215124
am: 17d5e9a028

Change-Id: I55e393d1abf4b2302f90945783791208e658c632